wok-next rev 14756

linux-uml: add default initrd
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jun 18 09:58:46 2013 +0200 (2013-06-18)
parents 6f23be282ae6
children 372dd84badab
files busybox-boot/receipt linux-uml/receipt
line diff
     1.1 --- a/busybox-boot/receipt	Mon Jun 17 19:15:31 2013 +0000
     1.2 +++ b/busybox-boot/receipt	Tue Jun 18 09:58:46 2013 +0200
     1.3 @@ -82,8 +82,8 @@
     1.4  	$jslinux && echo 'stty -F $TTY rows 30 2>/dev/null' >> $fs/usr/share/boot/init
     1.5  	cat >> $fs/usr/share/boot/init <<EOT
     1.6  
     1.7 -busybox | sed '/Current/,\$!d'
     1.8  while true; do
     1.9 +	busybox | sed '/Current/,\$!d'
    1.10  	if [ -x /bin/setsid ]; then
    1.11  		setsid sh -c "exec sh <\$TTY >\$TTY 2>&1"
    1.12  	else
     2.1 --- a/linux-uml/receipt	Mon Jun 17 19:15:31 2013 +0000
     2.2 +++ b/linux-uml/receipt	Tue Jun 18 09:58:46 2013 +0200
     2.3 @@ -6,7 +6,6 @@
     2.4  KBASEVER="3.2"
     2.5  CATEGORY="base-system"
     2.6  SHORT_DESC="The User Mode Linux kernel."
     2.7 -BUILD_DEPENDS="bash perl"
     2.8  MAINTAINER="pascal.bellard@slitaz.org"
     2.9  LICENSE="GPL2"
    2.10  TARBALL="$SOURCE-$KBASEVER.tar.xz"
    2.11 @@ -16,6 +15,8 @@
    2.12  PATCH="$(dirname $WGET_URL)/patch-$VERSION.xz" &&
    2.13  EXTRA_SOURCE_FILES="$(basename $PATCH)"
    2.14  
    2.15 +BUILD_DEPENDS="bash perl busybox-boot"
    2.16 +
    2.17  # Rules to configure and make the package.
    2.18  compile_rules()
    2.19  {
    2.20 @@ -26,6 +27,7 @@
    2.21  		xzcat $SRC/$(basename $PATCH) | patch -Np1
    2.22  		touch done.patch-$VERSION
    2.23  	fi
    2.24 +	cp /usr/share/boot/initrd initrd.cpio
    2.25  	sed -i 's/uname -m/echo i386/;s|/bin/bash|/bin/ash|g' Makefile
    2.26  	make ARCH=um mrproper	
    2.27  	cat > mini.config << EOF &&
    2.28 @@ -81,6 +83,7 @@
    2.29  CONFIG_IP_NF_TARGET_REDIRECT=y
    2.30  CONFIG_NETDEVICES=y
    2.31  CONFIG_TUN=y
    2.32 +CONFIG_INITRAMFS_SOURCE="initrd.cpio"
    2.33  EOF
    2.34  	make ARCH=um allnoconfig KCONFIG_ALLCONFIG=mini.config &&
    2.35  	make ARCH=um