adapted to linux config naming changes

rebuild world
small fixes

3 files changed, 5 insertions, 10 deletions

diff --git a/i486-stage1/linux/DESCR b/i486-stage1/linux/DESCR
index 08bd6f0..f3fd3b0 100644
--- a/i486-stage1/linux/DESCR
+++ b/i486-stage1/linux/DESCR
@@ -8,11 +8,6 @@ ADDITIONAL_INSTALL_PACKAGE=linux-headers
 # we currently build a monolitic kernel for the basic stuff which was
 # available since 25 years. :-)
 
-# use the i486 configuration file
-# (TODO: adapt to config.$CARCH method later)
-sed -i 's@config.i686@config.i486@g' PKGBUILD
-sed -i 's@\.\./config@../config.i486@g' PKGBUILD
-
 # the Linux kernel has it's own way for cross compilation
 sed -i "s@make prepare@make prepare ARCH=$KERNEL_ARCH CROSS_COMPILE=$XTOOLS_ARCH_PREFIX@g" PKGBUILD
 sed -i "s@make config@make config ARCH=$KERNEL_ARCH CROSS_COMPILE=$XTOOLS_ARCH_PREFIX@g" PKGBUILD
diff --git a/i486-stage1/linux/config.i486 b/i486-stage1/linux/config
index 5d12540..5d12540 100644
--- a/i486-stage1/linux/config.i486
+++ b/i486-stage1/linux/config
diff --git a/i486-stage1/pacman/DESCR b/i486-stage1/pacman/DESCR
index 0ad0305..a3fc76e 100644
--- a/i486-stage1/pacman/DESCR
+++ b/i486-stage1/pacman/DESCR
@@ -17,9 +17,9 @@ sed -i "/makedepends=/s/'asciidoc'//" PKGBUILD
 cp pacman.conf.i686 pacman.conf.i486
 sed -i 's@^\(SigLevel\)@#\1@' pacman.conf.i486
 sed -i 's@^\(LocalFileSigLevel\)@#\1@' pacman.conf.i486
-# TODO: ADAPT sed -i 's@i686@i486@' pacman/PKGBUILD
-sed -i 's@./configure@./configure --host=i486-unknown-linux-gnu --build=x86_64-pc-linux-gnu@g' pacman/PKGBUILD
-# use 486 config and not 686 one
-sed -i 's@pacman.conf.i686@pacman.conf.i486@' pacman/PKGBUILD
+
+# use the 486 config and not 686 one
+sed -i 's@pacman.conf.i686@pacman.conf.i486@' PKGBUILD
+
 # some more architecture patching
-sed -i 's@i686@i486@g' pacman/PKGBUILD
+sed -i 's@i686@i486@g' PKGBUILD