[oe-commits] org.oe.dev merge of 'bb63b7b4eabc6cafcaa52db249a818525904f7de'

pfalcon commit openembedded-commits at lists.openembedded.org
Thu Nov 22 19:45:45 UTC 2007


merge of 'bb63b7b4eabc6cafcaa52db249a818525904f7de'
     and 'd645cc63fbf52fec48d747b81fd894d3fbb6848a'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 43b9a8037df652f9b2b16d07faa68cf5c54dd2cf
ViewMTN: http://monotone.openembedded.org/revision/info/43b9a8037df652f9b2b16d07faa68cf5c54dd2cf
Files:
1
packages/initrdscripts/initramfs-uniboot_0.2.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
conf/bitbake.conf
packages/initrdscripts/files/10-initfs.sh
packages/initrdscripts/files/80-loopboot.sh
packages/initrdscripts/initramfs-module-initfs_1.0.bb
packages/initrdscripts/initramfs-module-loop_1.0.bb
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.21.bb
packages/busybox/busybox-1.7.2/defconfig
packages/busybox/busybox-1.7.2/angstrom/defconfig
packages/busybox/busybox-1.7.2/angstrom
packages/busybox/busybox-1.2.0/angstrom/defconfig
packages/busybox/busybox-1.2.1/angstrom/defconfig
packages/busybox/busybox-1.2.2/angstrom/defconfig
packages/busybox/busybox-1.3.1/angstrom/defconfig
packages/busybox/busybox-1.5.0/angstrom/defconfig
packages/busybox/busybox-1.6.0/angstrom/defconfig
packages/busybox/busybox_1.00.bb
packages/busybox/busybox_1.01.bb
packages/busybox/busybox_1.2.0.bb
packages/busybox/busybox_1.2.1.bb
packages/busybox/busybox_1.2.2.bb
packages/busybox/busybox_1.3.1.bb
packages/busybox/busybox_1.5.0.bb
packages/busybox/busybox_1.6.0.bb
packages/busybox/busybox_1.7.2.bb
Diffs:

#
# mt diff -rbb63b7b4eabc6cafcaa52db249a818525904f7de -r43b9a8037df652f9b2b16d07faa68cf5c54dd2cf
#
# 
# 
# rename "packages/initrdscripts/initramfs-uniboot_0.2.bb"
#     to "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# 
# add_file "packages/initrdscripts/files/30-bootmenu.sh"
#  content [dcac7a351d81139c5e5c42d7115e7df562f936a1]
# 
# add_file "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  content [8f8e42c6e5c128c065b336db59a056006457d5b6]
# 
# patch "conf/bitbake.conf"
#  from [4ed306ec9f44c19fe02153d4d9a25294d8358687]
#    to [296476eab302b3db132347510f665c6d65f38712]
# 
# patch "packages/initrdscripts/files/10-initfs.sh"
#  from [d465ec9d2b5d5844df88903025838a9ed7b2b71e]
#    to [31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9]
# 
# patch "packages/initrdscripts/files/80-loopboot.sh"
#  from [6a222daa1b30d19d21806025cfc9406f558c4564]
#    to [b7b859d401a0118c57e557ce8fb22b0a185477cd]
# 
# patch "packages/initrdscripts/initramfs-module-initfs_1.0.bb"
#  from [8675b755e99c714a0b0832408ad466b6b39c66e3]
#    to [7ccc0b4a92ee8e901d4342bc7763cc3a48728c54]
# 
# patch "packages/initrdscripts/initramfs-module-loop_1.0.bb"
#  from [bfcc27d50d73081f3f8d3c7844e6187cec89c9e9]
#    to [8855abd2b8aa026fd8fc30621bc4c14f7b85a907]
# 
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
#  from [c9fb5cdf0e7c885832b90ab85385224531969248]
#    to [64d8e47ab51e813d995200750f5b07ab0cd181fe]
# 
# patch "packages/linux/linux-rp.inc"
#  from [3a8abe2f6791601f240fbf36eb1b3f9dbbab5d37]
#    to [0754d43aed9f1733a268bc5a327d596268b601e3]
# 
# patch "packages/linux/linux-rp_2.6.21.bb"
#  from [48c008dba96498446b62a8e5235f31358a38d26e]
#    to [8c217a9d5063a2507dca17af6cadab2c38b84e5a]
# 
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh	dcac7a351d81139c5e5c42d7115e7df562f936a1
+++ packages/initrdscripts/files/30-bootmenu.sh	dcac7a351d81139c5e5c42d7115e7df562f936a1
@@ -0,0 +1,154 @@
+# If root is explicitly specified, skip interactive selection
+if [ -z "$ROOT_DEVICE" ]; then
+##############################
+
+E="\033["
+MOUNTLOC="tmp"
+LOOP_IMG_MASK='*.img'
+
+if ! (echo " " | read -n1 foo) >/dev/null 2>&1; then
+    echo "'read' command lacks -n switch support, aborting" 
+    exit 1
+fi
+
+mkdir -p $MOUNTLOC
+
+list=""
+
+add_menu_item()
+{
+    if [ -n "$list" ]; then
+	list="$list\n"
+    fi
+	
+    list="$list$1"
+}
+
+show_menu() {
+    echo -e -n "${E}3;0H"
+    cnt=0
+    echo -e $list | \
+    while read l; do
+        if [ $cnt == $num ]; then
+	    echo -e -n "${E}1m"
+	fi
+        echo -e "$cnt: $l${E}0m"
+	cnt=$((cnt + 1))
+    done
+}
+
+get_menu_selection()
+{
+    cnt=0
+    sel=`echo -e $list | \
+    while read l; do
+    if [ $cnt == $num ]; then
+	    echo $l
+	    break
+	fi
+	cnt=$((cnt + 1))
+    done`
+}
+
+get_partition_type()
+{
+    fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC`
+}
+
+scan_for_loopimgs()
+{
+# Scan a device for loopback images, add to the list if found
+	mount /dev/$dev $MOUNTLOC
+	p=$PWD
+	cd $MOUNTLOC
+	for img in `ls -1 $LOOP_IMG_MASK 2>/dev/null`; do
+	    add_menu_item "$dev/$img (loop img on vfat)"
+	done
+	cd $p
+	umount $MOUNTLOC
+}
+
+# Scan all available device/partitions
+while read maj min nblk dev; do
+    if [ -z "$maj" -o "$maj" == "major" ]; then
+	continue;
+    fi
+
+    get_partition_type
+    if [ "$fstype" != "ext2" -a "$fstype" != "ext3" -a "$fstype" != "vfat" ]; then
+#	continue
+	true
+    fi
+    
+    if [ "$fstype" == "vfat" ]; then
+	scan_for_loopimgs
+	continue
+    fi
+    
+    add_menu_item "$dev ($fstype)"
+done < /proc/partitions
+
+add_menu_item "NFS (nfsroot=192.168.2.200:/nfs/image)"
+
+total=`echo -e $list | wc -l`
+num=0
+
+# Draw UI
+stty -echo
+echo -e -n "${E}2J"
+echo -e -n "${E}0;0H"
+echo "Select boot image:"
+
+# Main loop
+show_menu
+while read -n1 i; do
+    case "$i" in
+	"A")
+	    num=$((num - 1))
+	    if [ $num -lt 0 ]; then
+		num=$(($total - 1))
+	    fi
+	;;
+	["B"-"Z"])
+	    num=$((num + 1))
+	    if [ $num -ge $total ]; then
+		num=0
+	    fi
+	;;
+	"q")
+	    exec sh
+	;;
+	"")
+	    break
+	;;
+    esac
+    show_menu
+#    echo "*$esc$i"
+done
+
+stty echo
+
+# Process results of user selection, prepare input arguments
+# for boot modules
+
+get_menu_selection
+echo Selected: $sel
+
+dev=`expr "$sel" : '\([^ /]*\)'`
+path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
+
+if [ "$dev" == "NFS" ]; then
+    ROOT_DEVICE="/dev/nfs"
+    CMDLINE="$CMDLINE nfsroot=192.168.2.200:/nfs/image"
+elif [ -n "$path" ]; then
+    ROOT_DEVICE="/dev/loop"
+    CMDLINE="looproot=/dev/$dev:$path"
+else
+    ROOT_DEVICE="/dev/$dev"
+fi
+
+echo ROOT_DEVICE=$ROOT_DEVICE
+echo CMDLINE=$CMDLINE
+
+##############################
+fi
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	8f8e42c6e5c128c065b336db59a056006457d5b6
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	8f8e42c6e5c128c065b336db59a056006457d5b6
@@ -0,0 +1,11 @@
+SRC_URI = "file://30-bootmenu.sh"
+PR = "r1"
+RDEPENDS = "util-linux-mount initramfs-uniboot initramfs-module-block initramfs-module-loop"
+DESCRIPTION = "An initramfs module with UI for selection of boot device."
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -m 0755 ${WORKDIR}/30-bootmenu.sh ${D}/initrd.d/
+}
+
+FILES_${PN} += " /initrd.d/* "
============================================================
--- conf/bitbake.conf	4ed306ec9f44c19fe02153d4d9a25294d8358687
+++ conf/bitbake.conf	296476eab302b3db132347510f665c6d65f38712
@@ -107,7 +107,18 @@ DATETIME = "${DATE}${TIME}"
 
 # python-native should be here but python relies on building 
 # its own in staging
-ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime texinfo-native util-linux-native"
+ASSUME_PROVIDED = "\
+    bc-native \
+    bzip2-native \
+    cvs-native \
+    diffstat-native \
+    patch-native \
+    perl-native-runtime \
+    python-native-runtime \
+    svn-native \
+    texinfo-native \
+    util-linux-native \
+    "
 
 ##################################################################
 # Package default variables.
============================================================
--- packages/initrdscripts/files/10-initfs.sh	d465ec9d2b5d5844df88903025838a9ed7b2b71e
+++ packages/initrdscripts/files/10-initfs.sh	31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9
@@ -1,5 +1,5 @@
 #!/bin/sh
 
+modprobe -q vfat >/dev/null 2>&1
+modprobe -q ext2 >/dev/null 2>&1
+modprobe -q ext3 >/dev/null 2>&1
-modprobe vfat
-modprobe ext2
-modprobe ext3
============================================================
--- packages/initrdscripts/files/80-loopboot.sh	6a222daa1b30d19d21806025cfc9406f558c4564
+++ packages/initrdscripts/files/80-loopboot.sh	b7b859d401a0118c57e557ce8fb22b0a185477cd
@@ -21,11 +21,10 @@ if [ "$ROOT_DEVICE" = "/dev/loop" ]; the
             echo "Mounting $dev on $hostpt"
             mkdir $hostpt
             mount $dev $hostpt
-            cd $hostpt
         fi
     
         echo "Loopback setup of $path (offset $offset)"
-        losetup -o "$offset" "$loopdev" "$path"
+        losetup -o "$offset" "$loopdev" "$hostpt/$path"
 
         echo "Mounting $loopdev on $mountpt"
         mkdir "$mountpt"
============================================================
--- packages/initrdscripts/initramfs-module-initfs_1.0.bb	8675b755e99c714a0b0832408ad466b6b39c66e3
+++ packages/initrdscripts/initramfs-module-initfs_1.0.bb	7ccc0b4a92ee8e901d4342bc7763cc3a48728c54
@@ -1,5 +1,5 @@ SRC_URI = "file://10-initfs.sh"
 SRC_URI = "file://10-initfs.sh"
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "An initramfs module for initializing filesystems."
 RDEPENDS = "initramfs-uniboot"
 RRECOMMENDS = "kernel-module-vfat kernel-module-ext2"
============================================================
--- packages/initrdscripts/initramfs-module-loop_1.0.bb	bfcc27d50d73081f3f8d3c7844e6187cec89c9e9
+++ packages/initrdscripts/initramfs-module-loop_1.0.bb	8855abd2b8aa026fd8fc30621bc4c14f7b85a907
@@ -1,8 +1,8 @@ SRC_URI = "file://80-loopboot.sh"
 SRC_URI = "file://80-loopboot.sh"
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \
                mounting it."
-RDEPENDS = "initramfs-uniboot"
+RDEPENDS = "initramfs-uniboot initramfs-module-initfs"
 RRECOMMENDS = "kernel-module-loop kernel-module-vfat"
 
 do_install() {
============================================================
--- packages/initrdscripts/initramfs-uniboot_0.2.bb	c9fb5cdf0e7c885832b90ab85385224531969248
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb	64d8e47ab51e813d995200750f5b07ab0cd181fe
@@ -1,5 +1,5 @@ SRC_URI = "file://init.sh"
 SRC_URI = "file://init.sh"
-PR = "r1"
+PR = "r0"
 DESCRIPTON = "A modular initramfs init script system."
 RDEPENDS = "busybox-static"
 RRECOMMENDS = "kernel-module-uinput"
============================================================
--- packages/linux/linux-rp.inc	3a8abe2f6791601f240fbf36eb1b3f9dbbab5d37
+++ packages/linux/linux-rp.inc	0754d43aed9f1733a268bc5a327d596268b601e3
@@ -1,9 +1,10 @@ inherit kernel
 DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750."
 SECTION = "kernel"
 LICENSE = "GPL"
 
 inherit kernel
 
+DEPENDS_collie += "bc-native"
 RPROVIDES_kernel-base += "hostap-modules"
 
 DOSRC = "http://www.do13.de/openzaurus/patches"
============================================================
--- packages/linux/linux-rp_2.6.21.bb	48c008dba96498446b62a8e5235f31358a38d26e
+++ packages/linux/linux-rp_2.6.21.bb	8c217a9d5063a2507dca17af6cadab2c38b84e5a
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r10"
+PR = "r11"
 
 DEFAULT_PREFERENCE_collie = "1"
 


#
# mt diff -rd645cc63fbf52fec48d747b81fd894d3fbb6848a -r43b9a8037df652f9b2b16d07faa68cf5c54dd2cf
#
# 
# 
# rename "packages/busybox/busybox-1.7.2/defconfig"
#     to "packages/busybox/busybox-1.7.2/angstrom/defconfig"
# 
# add_dir "packages/busybox/busybox-1.7.2/angstrom"
# 
# patch "packages/busybox/busybox-1.2.0/angstrom/defconfig"
#  from [1d0c34a41f6ddc8cb44993383113a9728ae54b3e]
#    to [c840b31152228806fb59732e07aaf7cae2d992ad]
# 
# patch "packages/busybox/busybox-1.2.1/angstrom/defconfig"
#  from [95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe]
#    to [74661e9906a21f52200ff69389c9b0a841175d30]
# 
# patch "packages/busybox/busybox-1.2.2/angstrom/defconfig"
#  from [95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe]
#    to [74661e9906a21f52200ff69389c9b0a841175d30]
# 
# patch "packages/busybox/busybox-1.3.1/angstrom/defconfig"
#  from [95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe]
#    to [74661e9906a21f52200ff69389c9b0a841175d30]
# 
# patch "packages/busybox/busybox-1.5.0/angstrom/defconfig"
#  from [95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe]
#    to [74661e9906a21f52200ff69389c9b0a841175d30]
# 
# patch "packages/busybox/busybox-1.6.0/angstrom/defconfig"
#  from [95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe]
#    to [74661e9906a21f52200ff69389c9b0a841175d30]
# 
# patch "packages/busybox/busybox-1.7.2/angstrom/defconfig"
#  from [6a1aa7bd1cb60a4aa10a48155b441ede4a795cf9]
#    to [d500c2dcc78577bcce9fe928b8542d34bd58eb89]
# 
# patch "packages/busybox/busybox_1.00.bb"
#  from [258f793d9652a6bd48018c091893d8b13418449a]
#    to [a4331e926e10003bf120d6d761b2d94e554c6ab9]
# 
# patch "packages/busybox/busybox_1.01.bb"
#  from [35d3c7fe8e5aacb16a4df6b4f65b11b6631437ea]
#    to [fe8c2ae3dfef97627e65390145d5bb3ab2722b58]
# 
# patch "packages/busybox/busybox_1.2.0.bb"
#  from [582a97888e7379515adb7440469f7314ab9a7e66]
#    to [d5b502a46e23450ef45c246b6cd1bc5bc19a85b9]
# 
# patch "packages/busybox/busybox_1.2.1.bb"
#  from [bbd3e1d71e9143dcc0ad5cc7b1df2f1fce1d040e]
#    to [b96488a91da7518ee196271962642b690a836f43]
# 
# patch "packages/busybox/busybox_1.2.2.bb"
#  from [d7032fae1f6036be28cbb1751cd7127f01cdff7e]
#    to [9a7b3b424e39aba49cdf21789617b9acfdcff337]
# 
# patch "packages/busybox/busybox_1.3.1.bb"
#  from [964b2f4a664543251be9089d32576a10fe6177e6]
#    to [1c0b219537af9fa60794f49a044ab901d094d22e]
# 
# patch "packages/busybox/busybox_1.5.0.bb"
#  from [2455967b6c74cc9829dcd674b7da842894dbca03]
#    to [22af2fc88f9ad703e235c0e622f6b164d0097b0c]
# 
# patch "packages/busybox/busybox_1.6.0.bb"
#  from [2455967b6c74cc9829dcd674b7da842894dbca03]
#    to [22af2fc88f9ad703e235c0e622f6b164d0097b0c]
# 
# patch "packages/busybox/busybox_1.7.2.bb"
#  from [cd6bc69516d4acbd5cc7d47a3423aee23d4ff564]
#    to [1e1d0bb66c4d82a43e2a073458e3f96f5e82d2e7]
# 
============================================================
--- packages/busybox/busybox-1.2.0/angstrom/defconfig	1d0c34a41f6ddc8cb44993383113a9728ae54b3e
+++ packages/busybox/busybox-1.2.0/angstrom/defconfig	c840b31152228806fb59732e07aaf7cae2d992ad
@@ -603,8 +603,8 @@ CONFIG_ASH_JOB_CONTROL=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
============================================================
--- packages/busybox/busybox-1.2.1/angstrom/defconfig	95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe
+++ packages/busybox/busybox-1.2.1/angstrom/defconfig	74661e9906a21f52200ff69389c9b0a841175d30
@@ -603,8 +603,8 @@ CONFIG_ASH_JOB_CONTROL=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
============================================================
--- packages/busybox/busybox-1.2.2/angstrom/defconfig	95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe
+++ packages/busybox/busybox-1.2.2/angstrom/defconfig	74661e9906a21f52200ff69389c9b0a841175d30
@@ -603,8 +603,8 @@ CONFIG_ASH_JOB_CONTROL=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
============================================================
--- packages/busybox/busybox-1.3.1/angstrom/defconfig	95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe
+++ packages/busybox/busybox-1.3.1/angstrom/defconfig	74661e9906a21f52200ff69389c9b0a841175d30
@@ -603,8 +603,8 @@ CONFIG_ASH_JOB_CONTROL=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
============================================================
--- packages/busybox/busybox-1.5.0/angstrom/defconfig	95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe
+++ packages/busybox/busybox-1.5.0/angstrom/defconfig	74661e9906a21f52200ff69389c9b0a841175d30
@@ -603,8 +603,8 @@ CONFIG_ASH_JOB_CONTROL=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
============================================================
--- packages/busybox/busybox-1.6.0/angstrom/defconfig	95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe
+++ packages/busybox/busybox-1.6.0/angstrom/defconfig	74661e9906a21f52200ff69389c9b0a841175d30
@@ -603,8 +603,8 @@ CONFIG_ASH_JOB_CONTROL=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
============================================================
--- packages/busybox/busybox-1.7.2/defconfig	6a1aa7bd1cb60a4aa10a48155b441ede4a795cf9
+++ packages/busybox/busybox-1.7.2/angstrom/defconfig	d500c2dcc78577bcce9fe928b8542d34bd58eb89
@@ -677,8 +677,8 @@ CONFIG_ASH_JOB_CONTROL=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
============================================================
--- packages/busybox/busybox_1.00.bb	258f793d9652a6bd48018c091893d8b13418449a
+++ packages/busybox/busybox_1.00.bb	a4331e926e10003bf120d6d761b2d94e554c6ab9
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r37"
+PR = "r38"
 
 SRC_URI += "file://add-getkey-applet.patch;patch=1 \
            file://below.patch;patch=1 \
============================================================
--- packages/busybox/busybox_1.01.bb	35d3c7fe8e5aacb16a4df6b4f65b11b6631437ea
+++ packages/busybox/busybox_1.01.bb	fe8c2ae3dfef97627e65390145d5bb3ab2722b58
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r12"
+PR = "r13"
 
 SRC_URI += "file://add-getkey-applet.patch;patch=1 \
            file://below.patch;patch=1 \
============================================================
--- packages/busybox/busybox_1.2.0.bb	582a97888e7379515adb7440469f7314ab9a7e66
+++ packages/busybox/busybox_1.2.0.bb	d5b502a46e23450ef45c246b6cd1bc5bc19a85b9
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://defconfig"
 
============================================================
--- packages/busybox/busybox_1.2.1.bb	bbd3e1d71e9143dcc0ad5cc7b1df2f1fce1d040e
+++ packages/busybox/busybox_1.2.1.bb	b96488a91da7518ee196271962642b690a836f43
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r13"
+PR = "r14"
 
 SRC_URI += "file://wget-long-options.patch;patch=1 \
 	   file://df_rootfs.patch;patch=1 \
============================================================
--- packages/busybox/busybox_1.2.2.bb	d7032fae1f6036be28cbb1751cd7127f01cdff7e
+++ packages/busybox/busybox_1.2.2.bb	9a7b3b424e39aba49cdf21789617b9acfdcff337
@@ -1,5 +1,7 @@ require busybox.inc
 require busybox.inc
 
+PR = "r1"
+
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "file://wget-long-options.patch;patch=1 \
============================================================
--- packages/busybox/busybox_1.3.1.bb	964b2f4a664543251be9089d32576a10fe6177e6
+++ packages/busybox/busybox_1.3.1.bb	1c0b219537af9fa60794f49a044ab901d094d22e
@@ -1,5 +1,7 @@ require busybox.inc
 require busybox.inc
 
+PR = "r1"
+
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "file://defconfig"
============================================================
--- packages/busybox/busybox_1.5.0.bb	2455967b6c74cc9829dcd674b7da842894dbca03
+++ packages/busybox/busybox_1.5.0.bb	22af2fc88f9ad703e235c0e622f6b164d0097b0c
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/busybox/busybox_1.6.0.bb	2455967b6c74cc9829dcd674b7da842894dbca03
+++ packages/busybox/busybox_1.6.0.bb	22af2fc88f9ad703e235c0e622f6b164d0097b0c
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
============================================================
--- packages/busybox/busybox_1.7.2.bb	cd6bc69516d4acbd5cc7d47a3423aee23d4ff564
+++ packages/busybox/busybox_1.7.2.bb	1e1d0bb66c4d82a43e2a073458e3f96f5e82d2e7
@@ -1,6 +1,6 @@ require busybox.inc
 require busybox.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 






More information about the Openembedded-commits mailing list