adapted to linux config naming changes

rebuild world
small fixes

7 files changed, 21 insertions, 15 deletions

diff --git a/BUGS b/BUGS
new file mode 100644
index 0000000..5d17d2d
--- /dev/null
+++ b/BUGS
@@ -0,0 +1,4 @@
+bsdtar: /home/cross/i486-root/packages/i486/linux-docs-4.15.1-2-i486.pkg.tar.xz: Not found in archive
+bsdtar: /home/cross/i486-root/packages/i486/linux-headers-4.15.1-2-i486.pkg.tar.xz: Not found in archive
+bsdtar: Error exit delayed from previous errors.
+Built package linux.
diff --git a/TODOS b/TODOS
index dea9adb..b3d436f 100644
--- a/TODOS
+++ b/TODOS
@@ -5,4 +5,3 @@
 - makepkg with an 'alternate root' option (which doens't collide with
   pacman's options), avoids patching -r and --config into makepkg for
   stage1
-  
diff --git a/build_stage1_package.sh b/build_stage1_package.sh
index 585f2db..a73cb17 100755
--- a/build_stage1_package.sh
+++ b/build_stage1_package.sh
@@ -70,7 +70,7 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -
 	# copy all other files from Archlinux32, if they exist
 	# (we assume, we only take core packages during stage1)
 	if test -f "$DIFF_PKGBUILD"; then
-		find $ARCHLINUX32_PACKAGES/core/pacman-mirrorlist/* ! -name PKGBUILD \
+		find $ARCHLINUX32_PACKAGES/core/$PACKAGE/* ! -name PKGBUILD \
 			-exec cp {} . \;
 	fi
 	
@@ -82,8 +82,10 @@ if test $(pacman --config "$STAGE1_CHROOT/etc/pacman.conf" -r "$STAGE1_CHROOT" -
 	fi
 	
 	# copy all files into the build area (but the package DESCR file)
-	cp $PACKAGE_DIR/* .
-	rm -f DESCR
+	if test -d $PACKAGE_DIR; then
+		find $PACKAGE_DIR/* ! -name DESCR \
+			-exec cp {} . \;
+	fi
 
 	# disable or enable parallel builds
 	
diff --git a/create_cdrom.sh b/create_cdrom.sh
index b0dab38..e53bbf5 100755
--- a/create_cdrom.sh
+++ b/create_cdrom.sh
@@ -6,12 +6,15 @@
 # no ramdisk, no modules, no fancy startup, just a shell script
 
 sudo rm -rf $STAGE1_ISOLINUX
+
+# copy chroot to ISOlinux dir
 mkdir $STAGE1_ISOLINUX
 sudo cp -a $STAGE1_CHROOT/* $STAGE1_ISOLINUX/.
 sudo chown -R cross:cross $STAGE1_ISOLINUX/.
 cd $STAGE1_ISOLINUX
+
+# simple ISOlinux menu, with options for fast choosing a root device
 mkdir boot/isolinux
-sudo chown cross:cross boot/isolinux/isolinux.cfg
 cat >boot/isolinux/isolinux.cfg <<EOF
 UI menu.c32
 TIMEOUT 300
@@ -35,7 +38,10 @@ LABEL sr1
 	KERNEL /boot/vmlinuz-linux
 	APPEND root=/dev/sr1 init=/sbin/init console=ttyS0 console=tty0'
 EOF
+sudo chown cross:cross boot/isolinux/isolinux.cfg
+
 mkdir -p etc/init
+
 cat >etc/init/boot <<EOF
 #!/bin/sh
 mount -t proc proc /proc
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