[oe-commits] org.oe.dev merge of '01a1687d6a3a1aa8b8ba912066a682526987fd4f'

woglinde2 commit openembedded-commits at lists.openembedded.org
Thu Nov 22 21:29:02 UTC 2007 

merge of '01a1687d6a3a1aa8b8ba912066a682526987fd4f'
     and '74f9f9386f21c9cc7120b518b57aa3e7dee84477'

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 8bbe656037791fd23ecdf85fe390e4b3c1270ca0
ViewMTN: http://monotone.openembedded.org/revision/info/8bbe656037791fd23ecdf85fe390e4b3c1270ca0
Files:
1
packages/busybox/busybox-1.7.2/defconfig
packages/busybox/busybox-1.7.2/angstrom/defconfig
packages/initrdscripts/files/blockboot.sh
packages/initrdscripts/files/85-blockboot.sh
packages/initrdscripts/files/loopboot.sh
packages/initrdscripts/files/80-loopboot.sh
packages/initrdscripts/files/nfsboot.sh
packages/initrdscripts/files/80-nfsboot.sh
packages/initrdscripts/initramfs-module-block_0.1.bb
packages/initrdscripts/initramfs-module-block_1.0.bb
packages/initrdscripts/initramfs-module-loop_0.1.bb
packages/initrdscripts/initramfs-module-loop_1.0.bb
packages/initrdscripts/initramfs-module-nfs_0.1.bb
packages/initrdscripts/initramfs-module-nfs_1.0.bb
packages/initrdscripts/initramfs-uniboot_0.2.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
packages/busybox/busybox-1.7.2/angstrom
packages/hostap/hostap-daemon-0.6.0
packages/gettext/gettext-0.14.1/disable_java.patch
packages/hostap/hostap-daemon-0.6.0/init
packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
packages/hostap/hostap-daemon_0.6.0.bb
packages/initrdscripts/files/10-initfs.sh
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-initfs_1.0.bb
packages/midpath/midpath-pulseaudio_0.1.bb
packages/mpfr/mpfr-native_2.3.0.bb
packages/mpfr/mpfr_2.3.0.bb
conf/bitbake.conf
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
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-static-1.2.1/defconfig
packages/busybox/busybox-static_1.2.1.bb
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
packages/cacao/cacao-cldc_0.98.bb
packages/cacao/cacao.inc
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/dropbear/dropbear/init
packages/dropbear/dropbear_0.49.bb
packages/gettext/gettext_0.14.1.bb
packages/initrdscripts/files/init.sh
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.21.bb
packages/midpath/midpath-alsa_0.1.bb
packages/midpath/midpath-cldc-sdl_0.1.bb
packages/midpath/midpath-cldc-x11_0.1.bb
packages/midpath/midpath-cldc_0.1.bb
packages/midpath/midpath-gtk_0.1.bb
packages/midpath/midpath-qt3x11_0.1.bb
packages/midpath/midpath-qte_0.1.bb
packages/midpath/midpath.inc
packages/tasks/task-openmoko.bb
packages/meta/slugos-packages.bb
Diffs:

#
# mt diff -r01a1687d6a3a1aa8b8ba912066a682526987fd4f -r8bbe656037791fd23ecdf85fe390e4b3c1270ca0
#
# 
# 
# rename "packages/busybox/busybox-1.7.2/defconfig"
#     to "packages/busybox/busybox-1.7.2/angstrom/defconfig"
# 
# rename "packages/initrdscripts/files/blockboot.sh"
#     to "packages/initrdscripts/files/85-blockboot.sh"
# 
# rename "packages/initrdscripts/files/loopboot.sh"
#     to "packages/initrdscripts/files/80-loopboot.sh"
# 
# rename "packages/initrdscripts/files/nfsboot.sh"
#     to "packages/initrdscripts/files/80-nfsboot.sh"
# 
# rename "packages/initrdscripts/initramfs-module-block_0.1.bb"
#     to "packages/initrdscripts/initramfs-module-block_1.0.bb"
# 
# rename "packages/initrdscripts/initramfs-module-loop_0.1.bb"
#     to "packages/initrdscripts/initramfs-module-loop_1.0.bb"
# 
# rename "packages/initrdscripts/initramfs-module-nfs_0.1.bb"
#     to "packages/initrdscripts/initramfs-module-nfs_1.0.bb"
# 
# rename "packages/initrdscripts/initramfs-uniboot_0.2.bb"
#     to "packages/initrdscripts/initramfs-uniboot_1.0.bb"
# 
# add_dir "packages/busybox/busybox-1.7.2/angstrom"
# 
# add_dir "packages/hostap/hostap-daemon-0.6.0"
# 
# add_file "packages/gettext/gettext-0.14.1/disable_java.patch"
#  content [3cb235c3528f9fea47f41d0f6ce9967545e09d2b]
# 
# add_file "packages/hostap/hostap-daemon-0.6.0/init"
#  content [80bfdea40d350f7069665dbcaf302de3874d55b3]
# 
# add_file "packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff"
#  content [8ff0a526fa703041b901ba825fab2cca7fbe1ca8]
# 
# add_file "packages/hostap/hostap-daemon_0.6.0.bb"
#  content [5eb3e365f82dc33607030d0705fdf7c84d502cdd]
# 
# add_file "packages/initrdscripts/files/10-initfs.sh"
#  content [31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9]
# 
# add_file "packages/initrdscripts/files/30-bootmenu.sh"
#  content [dcac7a351d81139c5e5c42d7115e7df562f936a1]
# 
# add_file "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  content [8f8e42c6e5c128c065b336db59a056006457d5b6]
# 
# add_file "packages/initrdscripts/initramfs-module-initfs_1.0.bb"
#  content [7ccc0b4a92ee8e901d4342bc7763cc3a48728c54]
# 
# add_file "packages/midpath/midpath-pulseaudio_0.1.bb"
#  content [eb944e221aa04ed0c5a06788cd304f5aee0476da]
# 
# add_file "packages/mpfr/mpfr-native_2.3.0.bb"
#  content [41f0822f894ea44761b8d80834b7ded6ed91ad66]
# 
# add_file "packages/mpfr/mpfr_2.3.0.bb"
#  content [cf33f92188e335cfc3ddb54fabfa1c1167369430]
# 
# patch "conf/bitbake.conf"
#  from [4ed306ec9f44c19fe02153d4d9a25294d8358687]
#    to [296476eab302b3db132347510f665c6d65f38712]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [6418329b9ade84d12329d5175ac7819e41dc9e11]
#    to [2d16ad483496ff951a3f0b328f54cd73337dfc61]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [b1e3777e41aa3fe56bbd5ae76a0a3062c64c1cdd]
#    to [d405f584be665c3811a81f973e98574037e5001a]
# 
# 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-static-1.2.1/defconfig"
#  from [95138937ebf2eb26a7fa99eb07cf34f2c82f0fbe]
#    to [74661e9906a21f52200ff69389c9b0a841175d30]
# 
# patch "packages/busybox/busybox-static_1.2.1.bb"
#  from [2aae552c9e19ab74a14a57276fb0958dac8be71a]
#    to [6188142c6538e150b17df1a61af6eb200ed871c6]
# 
# 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]
# 
# patch "packages/cacao/cacao-cldc_0.98.bb"
#  from [638b504328b4b00e7847c72728b8fd48190cd126]
#    to [d075f4c8402dcd779ca32535993ba6af6aafdafd]
# 
# patch "packages/cacao/cacao.inc"
#  from [850a3631e55de6c25da31b955be07c7b8c2a42e3]
#    to [d8bc9087bb9ca79854ffb1d26ff94e4bafea0159]
# 
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
#  from [5aa5f424cbcebd9908f562377e94c17a036798e8]
#    to [70727331bb54728e45f64ce0f2d252d870e2bf51]
# 
# patch "packages/dropbear/dropbear/init"
#  from [45b9ebed88af2de0bfe8e8d2abc1d01ff29b19c9]
#    to [dc87c2bfcc739f6c78f4d67c3d60adf9809efb2f]
# 
# patch "packages/dropbear/dropbear_0.49.bb"
#  from [1652aef0bcc137fa060869697210c0439a28298c]
#    to [ca38761fd3af49819c41b42791592ee01c0d97cc]
# 
# patch "packages/gettext/gettext_0.14.1.bb"
#  from [e36d89752702208db243d7f58d7848a83bad0563]
#    to [ae084090fcdd110056d5ce81e5ee0a81bd15fffa]
# 
# patch "packages/initrdscripts/files/80-loopboot.sh"
#  from [895a6f6b6aebecbc1064e069019e70f93c8e380a]
#    to [b7b859d401a0118c57e557ce8fb22b0a185477cd]
# 
# patch "packages/initrdscripts/files/init.sh"
#  from [71313983c36c150465f7a9caca6f672da5828e4a]
#    to [d6057201f9ee2a9e2d44ed71124d43142bc1a05f]
# 
# patch "packages/initrdscripts/initramfs-module-block_1.0.bb"
#  from [d2734bb38fc38436cca15c61934df15410ed60d4]
#    to [877659cf4df66f5a8a377c2289bd1de30d995e18]
# 
# patch "packages/initrdscripts/initramfs-module-loop_1.0.bb"
#  from [62efec45176482cb2d1809fa28f9a8e81d393239]
#    to [8855abd2b8aa026fd8fc30621bc4c14f7b85a907]
# 
# patch "packages/initrdscripts/initramfs-module-nfs_1.0.bb"
#  from [a66fd36e1870d25e7fe8685408615f9706dfce76]
#    to [a0732aae921a74765b68a2e86421a61b8a519701]
# 
# 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]
# 
# patch "packages/midpath/midpath-alsa_0.1.bb"
#  from [3b9cd6ad01860aa9c6ef173017b41052d720e9ad]
#    to [cdb38b276ca1e010fded8299464b1143a8079b57]
# 
# patch "packages/midpath/midpath-cldc-sdl_0.1.bb"
#  from [d4c391082d12422464fa05d027053d80e72073de]
#    to [cdc0198274025dc4aace2193322876e10d72c7aa]
# 
# patch "packages/midpath/midpath-cldc-x11_0.1.bb"
#  from [32a005bc8c128bb381ac3e795e9efea897db125f]
#    to [fa9d3d7fe3f54287c26f6d9e57241640e7edf920]
# 
# patch "packages/midpath/midpath-cldc_0.1.bb"
#  from [5f4356e7b663f2921a4419a7443a72987f557805]
#    to [207ecb961824e78d5556506fd417a98aec0cdeba]
# 
# patch "packages/midpath/midpath-gtk_0.1.bb"
#  from [aa5d09aafbc3d8a7fd37a4629dc7e86da0bcf8b4]
#    to [9aa618d4539e50f9f8af91c6c6eeacbfc5f131d8]
# 
# patch "packages/midpath/midpath-qt3x11_0.1.bb"
#  from [3f1384df13f5a0dbd7cea235b83e4fcb840c0c85]
#    to [9d7c04b2e318f9703bdd2dce4606d9c8d8c2cbf8]
# 
# patch "packages/midpath/midpath-qte_0.1.bb"
#  from [31c329b1caef113ff5b380787e4960b5a61d8049]
#    to [549d071305ff33976fb3b295f8abd83641872134]
# 
# patch "packages/midpath/midpath.inc"
#  from [0deb1420f019591c182424d43dc6670bda6274ec]
#    to [e9d8c24f154d72d1d4847d255e9e58c8dc1bb7d1]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [f0b4bb1fe9d73d5cd26853e1a02d2f654a4a71f3]
#    to [0d1d4e92a7c8f07375d840f5e0315ecf48ec2b5b]
# 
============================================================
--- packages/gettext/gettext-0.14.1/disable_java.patch	3cb235c3528f9fea47f41d0f6ce9967545e09d2b
+++ packages/gettext/gettext-0.14.1/disable_java.patch	3cb235c3528f9fea47f41d0f6ce9967545e09d2b
@@ -0,0 +1,33 @@
+Index: gettext-0.14.1/gettext-tools/configure.ac
+===================================================================
+--- gettext-0.14.1.orig/gettext-tools/configure.ac	2004-01-16 10:49:06.000000000 +0000
++++ gettext-0.14.1/gettext-tools/configure.ac	2007-11-14 21:43:39.000000000 +0000
+@@ -37,28 +37,16 @@
+ AC_PROG_YACC
+ 
+ gt_GCJ
+-if test -n "$HAVE_GCJ"; then
+-  BUILDJAVAEXE=yes
+-else
+   BUILDJAVAEXE=no
+-fi
+ AC_SUBST(BUILDJAVAEXE)
+ 
+ gt_JAVACOMP
+ AC_CHECK_PROG(JAR, jar, jar)
+-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+-  BUILDJAVA=yes
+-else
+   BUILDJAVA=no
+-fi
+ AC_SUBST(BUILDJAVA)
+ 
+ gt_JAVAEXEC
+-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
+-  TESTJAVA=yes
+-else
+   TESTJAVA=no
+-fi
+ AC_SUBST(TESTJAVA)
+ 
+ gt_CSHARPCOMP
============================================================
--- packages/hostap/hostap-daemon-0.6.0/init	80bfdea40d350f7069665dbcaf302de3874d55b3
+++ packages/hostap/hostap-daemon-0.6.0/init	80bfdea40d350f7069665dbcaf302de3874d55b3
@@ -0,0 +1,37 @@
+#!/bin/sh
+DAEMON=/usr/sbin/hostapd
+NAME=hostapd
+DESC="HOSTAP Daemon"
+ARGS="/etc/hostapd.conf -B"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+    start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S -x $DAEMON -- $ARGS
+	echo "$NAME."
+	;;
+    stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x $DAEMON
+	echo "$NAME."
+	;;
+    restart)
+	$0 stop
+	$0 start
+	;;
+    reload)
+	echo -n "Reloading $DESC: "
+	killall -HUP $(basename ${DAEMON})
+	echo "$NAME."
+	;;
+    *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+	;;
+esac
+
+exit 0
============================================================
--- packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff	8ff0a526fa703041b901ba825fab2cca7fbe1ca8
+++ packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff	8ff0a526fa703041b901ba825fab2cca7fbe1ca8
@@ -0,0 +1,25 @@
+diff -urN hostapd.orig/Makefile hostapd/Makefile
+--- hostapd.orig/Makefile	2007-05-28 19:26:55.000000000 +0200
++++ hostapd/Makefile	2007-11-22 16:28:44.000000000 +0100
+@@ -6,6 +6,8 @@
+ CFLAGS = -MMD -O2 -Wall -g
+ endif
+ 
++TARGET_PREFIX ?= /usr/local/bin/
++
+ # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+ # a file (undefine it, if you want to save in binary size)
+ CFLAGS += -DHOSTAPD_DUMP_STATE
+@@ -361,10 +363,10 @@
+ 	fi
+ 
+ install: all
+-	for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
++	for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
+ 
+ hostapd: $(OBJS)
+-	$(CC) -o hostapd $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+ 
+ OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+ hostapd_cli: $(OBJS_c)
============================================================
--- packages/hostap/hostap-daemon_0.6.0.bb	5eb3e365f82dc33607030d0705fdf7c84d502cdd
+++ packages/hostap/hostap-daemon_0.6.0.bb	5eb3e365f82dc33607030d0705fdf7c84d502cdd
@@ -0,0 +1,40 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
+	file://makefile-cross.diff;patch=1 \
+	file://defconfig \
+	file://init"
+
+S = "${WORKDIR}/hostapd-${PV}/hostapd"
+
+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
+
+inherit update-rc.d
+INITSCRIPT_NAME=hostapd
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	if [ "x$HAS_PCI" == "x1" ] ; then
+		echo "CONFIG_DRIVER_MADWIFI=y" >> .config
+		echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
+	fi
+}
+
+do_compile() {
+	CFLAGS='${CFLAGS}' CC='${CC}' make
+}
+
+do_install() {
+	install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
+	make TARGET_PREFIX=${D}${sbindir} install
+	install -m 0644 hostapd.conf ${D}${sysconfdir}
+	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
+}
+
============================================================
--- packages/initrdscripts/files/10-initfs.sh	31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9
+++ packages/initrdscripts/files/10-initfs.sh	31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9
@@ -0,0 +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
============================================================
--- 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_%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r74f9f9386f21c9cc7120b518b57aa3e7dee84477 -r8bbe656037791fd23ecdf85fe390e4b3c1270ca0
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [9c53992007de6add7732c5842fecc57b3f45128e]
#    to [9b834c983f46ed9c7341e66dad3ba5a5cb5fab48]
# 
============================================================
--- packages/meta/slugos-packages.bb	9c53992007de6add7732c5842fecc57b3f45128e
+++ packages/meta/slugos-packages.bb	9b834c983f46ed9c7341e66dad3ba5a5cb5fab48
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r41"
+PR = "r42"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -48,6 +48,7 @@ SLUGOS_PACKAGES = "\
 	cherokee \
 	coreutils \
 	cron \
+	cryptsetup \
 	ctorrent \
 	ctrlproxy \
 	cups \

More information about the Openembedded-commits mailing list