bugfixing, complete rebuild

added a todo list
building up to shadow, net-tools still breaks

2 files changed, 21 insertions, 0 deletions

diff --git a/packages-i486-stage1/net-tools b/packages-i486-stage1/net-tools
new file mode 100644
index 0000000..821bb63
--- /dev/null
+++ b/packages-i486-stage1/net-tools
@@ -0,0 +1,15 @@
+# prepare configure for cross-compilation
+sed -i "s@make @make CC=$TARGET_ARCH-cc LD=$TARGET_ARCH-ld@g" PKGBUILD
+sed -i "s@make\$@make CC=$TARGET_ARCH-cc LD=$TARGET_ARCH-ld @g" PKGBUILD
+
+# git for release checkouts, using the one from host
+sed -i "/makedepends/s/git//g" PKGBUILD
+
+# apply patch for double definitons in ip.h
+sed -i 's@source=(@source=(net-tools-1.60-if_tunnel.patch @' PKGBUILD
+sed -i "s@sha1sums=(@sha1sums=('SKIP' @" PKGBUILD
+sed -i '2!N; /prepare() {/ a \  pushd ${srcdir}/${pkgname}; patch -Np1 < ${srcdir}/net-tools-1.60-if_tunnel.patch; popd' PKGBUILD
+
+# TODO: wrong installation pathes, should be /usr/bin
+# install: cannot create regular file '/bin/ifconfig': Permission denied
+# make: *** [Makefile:216: installbin] Error 1
diff --git a/packages-i486-stage1/shadow b/packages-i486-stage1/shadow
index 7c71673..ff12a87 100644
--- a/packages-i486-stage1/shadow
+++ b/packages-i486-stage1/shadow
@@ -8,5 +8,11 @@ sed -i 's@makedepends\(.*\)@#makedepends\1@g' PKGBUILD
 sed -i 's@--enable-man@--disable-man@g' PKGBUILD
 sed -i '/find/,/-delete/{s/\(.*\)/#\1/g}' PKGBUILD
 sed -i '/rmdir/,/man8/{s/\(.*\)/#\1/g}' PKGBUILD
+# counterspells, yes I know, I'm bad with sed
 sed -i 's/^#}/}/' PKGBUILD
+# shadow: /usr/sbin exists in filesystem
+# revert last rmdir commenting of /usr/sbin removal
+sed -i 's@^# \+rmdir \+"$pkgdir/usr/sbin"@  rmdir "$pkgdir/usr/sbin"@' PKGBUILD
+
 sed -i '2!N; /prepare()/ a \  sed -i "/SUBDIRS/s/man//g" Makefile.am' PKGBUILD
+