building up to libarchive

2 files changed, 6 insertions, 5 deletions

diff --git a/i486-stage1/pam/DESCR b/i486-stage1/pam/DESCR
index 24f403e..2138c49 100644
--- a/i486-stage1/pam/DESCR
+++ b/i486-stage1/pam/DESCR
@@ -5,6 +5,7 @@ SYSROOT_INSTALL=1
 sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@" PKGBUILD
 
 # no flex, w3m, docboox-xml/xsl (no docu and take flex from the host)
+# tons of tools needed to build documentation, we ommit the documentation right now
 sed -i "s@makedepends=@#makedepends=@" PKGBUILD
 
 # disable NIS/YP
@@ -22,6 +23,3 @@ sed -i 's@./configure@./configure --disable-regenerate-docu@' PKGBUILD
 
 # no documentation built, so nothing to remove
 sed -i '2!N; /# FS #40749\n \+rm/ s/rm/#rm/g' PKGBUILD
-
-# tons of tools needed to build documentation, we ommit the documentation right now
-sed -i "s@makedepends@#makedepends@" PKGBUILD
diff --git a/i486-stage1/util-linux/DESCR b/i486-stage1/util-linux/DESCR
index 38e4b24..3c6e73c 100644
--- a/i486-stage1/util-linux/DESCR
+++ b/i486-stage1/util-linux/DESCR
@@ -8,8 +8,11 @@ ADDITIONAL_INSTALL_PACKAGE=libutil-linux
 sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@" PKGBUILD
 
 # disable some dependencies on systemd, python, libcap-ng
-sed -i 's@makedepends\(.*\)@#makedepends\1@g' PKGBUILD
-sed -i 's@ \+depends\(.*\)@#depends\1@g' PKGBUILD
+sed -i "/makedepends=/s/'systemd'//" PKGBUILD
+sed -i "/makedepends=/s/'python'//" PKGBUILD
+sed -i "/makedepends=/s/'libcap-ng'//" PKGBUILD
+sed -i "/depends=/s/'libsystemd'//" PKGBUILD
+sed -i "/depends=/s/'libcap-ng'//" PKGBUILD
 
 # no python
 sed -i 's@--with-python=3@--without-python \\@g' PKGBUILD