[oe-commits] org.oe.dev merge of '1caa2b8988bc7d01766f1668314bf16b821b2ff6'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Nov 22 19:45:07 UTC 2007
merge of '1caa2b8988bc7d01766f1668314bf16b821b2ff6'
and 'b4fb0e02c0de82a5593a04d6a92a465545d17e15'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 051316a155aa0e55225d2d8bed14412241ff4143
ViewMTN: http://monotone.openembedded.org/revision/info/051316a155aa0e55225d2d8bed14412241ff4143
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
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/zaurus-updater/spitz
packages/zaurus-updater/spitz/updater.sh
packages/cryptsetup
packages/hostap/hostap-daemon-0.6.0
packages/linux/ixp4xx-kernel/2.6.23
packages/autofs/autofs-4.1.4/no-bash.patch
packages/cryptsetup/cryptsetup_1.0.5.bb
packages/gcc/gcc-4.1.2/pr34130.patch
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/initscripts/initscripts-1.0/slugos/bootclean.sh
packages/initscripts/initscripts-1.0/slugos/volatiles
packages/linux/ixp4xx-kernel/2.6.23/defconfig
packages/linux/ixp4xx-kernel_2.6.23.8.bb
packages/linux/linux-openmoko/glamo-report-vram-size-to-userspace.patch
packages/mpfr/mpfr-native_2.3.0.bb
packages/mpfr/mpfr_2.3.0.bb
packages/portmap/portmap-6.0/no-pie.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/angstrom.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/local.conf.sample
packages/autofs/autofs_4.1.4.bb
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc_4.1.2.bb
packages/gettext/gettext_0.14.1.bb
packages/initscripts/initscripts-slugos_1.0.bb
packages/linux/ixp4xx-kernel/2.6.21/defconfig
packages/linux/ixp4xx-kernel_2.6.21.6.bb
packages/linux/linux-openmoko/defconfig-2.6.22.5
packages/linux/linux-openmoko_2.6.22.5.bb
packages/linux/linux-rp_2.6.23.bb
packages/meta/slugos-packages.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/portmap/portmap_6.0.bb
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_0.10.bb
packages/tasks/task-openmoko.bb
packages/wireless-tools/wireless-tools/wireless-tools.if-pre-up
packages/wireless-tools/wireless-tools_28+29pre21.bb
packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch
packages/wlan-ng/wlan-ng-modules_0.2.7.bb
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/zaurus-updater/akita/updater.sh
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:
#
# mt diff -r1caa2b8988bc7d01766f1668314bf16b821b2ff6 -r051316a155aa0e55225d2d8bed14412241ff4143
#
#
#
# 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 "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]
#
============================================================
--- 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/* "
============================================================
--- 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"
#
# mt diff -rb4fb0e02c0de82a5593a04d6a92a465545d17e15 -r051316a155aa0e55225d2d8bed14412241ff4143
#
#
#
# delete "packages/zaurus-updater/spitz"
#
# delete "packages/zaurus-updater/spitz/updater.sh"
#
# add_dir "packages/cryptsetup"
#
# add_dir "packages/hostap/hostap-daemon-0.6.0"
#
# add_dir "packages/linux/ixp4xx-kernel/2.6.23"
#
# add_file "packages/autofs/autofs-4.1.4/no-bash.patch"
# content [4eb3ed80313c234e6bd2311751e62211135fe24e]
#
# add_file "packages/cryptsetup/cryptsetup_1.0.5.bb"
# content [2523bf24ec0cfefc7fdd530d42d221ada86b4894]
#
# add_file "packages/gcc/gcc-4.1.2/pr34130.patch"
# content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
#
# 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/initscripts/initscripts-1.0/slugos/bootclean.sh"
# content [5ee9d16c6ee82710382962de81f55e894d4eb076]
#
# add_file "packages/initscripts/initscripts-1.0/slugos/volatiles"
# content [018cdf15373dbc496fd5aabfbb165ecaab713d78]
#
# add_file "packages/linux/ixp4xx-kernel/2.6.23/defconfig"
# content [de9465ffd409f23080029d85f44acbbc0b148eb7]
#
# add_file "packages/linux/ixp4xx-kernel_2.6.23.8.bb"
# content [40629ef0c93b593f7d9b64bc49c0c859be2e0680]
#
# add_file "packages/linux/linux-openmoko/glamo-report-vram-size-to-userspace.patch"
# content [c9d35297bee6c1f0e66123fe4919e96dc632cf70]
#
# add_file "packages/mpfr/mpfr-native_2.3.0.bb"
# content [41f0822f894ea44761b8d80834b7ded6ed91ad66]
#
# add_file "packages/mpfr/mpfr_2.3.0.bb"
# content [cf33f92188e335cfc3ddb54fabfa1c1167369430]
#
# add_file "packages/portmap/portmap-6.0/no-pie.patch"
# content [39990f66702db50dd93420291a2edf4e018b16f0]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch"
# content [fafdfc3854b5e99219b8730f6e4eec6426b59ec8]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/smedia-glamo.patch"
# content [9e6bb0c7c7556483765850cbd03efcd3fd9a55d8]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [b92f785bc1074bbab9c6a72a360b8ce4486976cb]
# to [2fd8530be37218a5cbf35df8dc71e053e5a2e088]
#
# patch "conf/distro/include/angstrom.inc"
# from [9a60ebf691335d1d901b90a8904aff3769f5c1e7]
# to [fbec2661b476213454b69adc6d89a7b5be329d4d]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [6418329b9ade84d12329d5175ac7819e41dc9e11]
# to [2d16ad483496ff951a3f0b328f54cd73337dfc61]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a7241387cffe65ec6d95b9d1ba03094818c4c4fd]
# to [d405f584be665c3811a81f973e98574037e5001a]
#
# patch "conf/local.conf.sample"
# from [beeeba5a341dd121dacd9a8b5f5a41f720c15f6d]
# to [3861d3e815459d94527022232b83f9e4c6699f55]
#
# patch "packages/autofs/autofs_4.1.4.bb"
# from [a424c6e4fee37df1589d0181c14420a3bc3267c2]
# to [5f81c9c9ebfabe495127eafbda0ce1c2d3ffa5b7]
#
# patch "packages/gcc/gcc-cross_4.1.2.bb"
# from [a848d98b3c6945c2d1c6945793cd4c470e593886]
# to [83f877f5f2ae3f14b9bf2a68b64d508fd1835087]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [520d602fe4601361883e3c07caf5990c6203f558]
# to [f83d37a6eb350627b87317b6e2b770377361267e]
#
# patch "packages/gettext/gettext_0.14.1.bb"
# from [e36d89752702208db243d7f58d7848a83bad0563]
# to [ae084090fcdd110056d5ce81e5ee0a81bd15fffa]
#
# patch "packages/initscripts/initscripts-slugos_1.0.bb"
# from [71d94c53d23cfef2b8d315d9ddb7041ec3ee445c]
# to [b75e27a4183122b65f6236b01b8b2c27a015094e]
#
# patch "packages/linux/ixp4xx-kernel/2.6.21/defconfig"
# from [6bf8be494f8b7c23b0232d7c99c5d8adf4028ba2]
# to [fb757ce6c7a72d4a879fe68c61d72b80b0a43d8a]
#
# patch "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
# from [f2a691df6724055699f734d3ccbd5cd557658115]
# to [6c2da58d1d1b58181b79e443296d131572a0291c]
#
# patch "packages/linux/linux-openmoko/defconfig-2.6.22.5"
# from [5e689013fe1bfa8136d80ab711b5dc1f1bd4d254]
# to [0ad0a08d6c357e7ddb1c404f4d28dfc5841533ba]
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
# from [ceab318f69d73c5b803a6c4c045abd2c43d97495]
# to [d9fa586ff6b631d3fe9d2a2c351310abc09112b3]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [d844e88bbee23da559c43cdc39a82d345c04e905]
# to [fd4ac29b114505fecc77298651fb1b8a4728f312]
#
# patch "packages/meta/slugos-packages.bb"
# from [710798742d5727a86f4c0272ea66e003273c4b35]
# to [9c53992007de6add7732c5842fecc57b3f45128e]
#
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# from [0d9b673125099a19dc66faba6b28c9b8b9d3b631]
# to [1455e724ba6335f63471c0c3d4a4117393aff80b]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [fbe2c5b1b35022fd032e2c27d0770f76a8a26d9e]
# to [cc58c28564075391245e716a991d21f7ead4d3f4]
#
# patch "packages/portmap/portmap_6.0.bb"
# from [03ff99fa49ea46ef110fd480411ca9033f51e14e]
# to [241baf929c36235b1a707377a729d0d306119226]
#
# patch "packages/slugos-init/files/turnup"
# from [0c939e1149cd95e3b6553c5766ba09a3a3984ada]
# to [9b5fe01bdf98e32a3d849b4f44d57f5329ac5862]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [35c419193e544a8d85ce740472291aa93c87fd37]
# to [e7df4dcb886e06a53c2e126edfc7dd3ce44f636c]
#
# patch "packages/tasks/task-openmoko.bb"
# from [f0b4bb1fe9d73d5cd26853e1a02d2f654a4a71f3]
# to [0d1d4e92a7c8f07375d840f5e0315ecf48ec2b5b]
#
# patch "packages/wireless-tools/wireless-tools/wireless-tools.if-pre-up"
# from [228c3fef26d845d555b9224407bf20cdd5e8b146]
# to [f5379dbf068307d6455e25860674bc3992a58f5f]
#
# patch "packages/wireless-tools/wireless-tools_28+29pre21.bb"
# from [3b563355328a1c0720bf0a0eabdaa7af976e9559]
# to [91d81a65f7a708204066ef118bb3905b343497c7]
#
# patch "packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch"
# from [be6a4b2aa961a49ffec3f9081246234b2804629e]
# to [813ab0fd454ea252d7f4e2434e7a9e7a486e350f]
#
# patch "packages/wlan-ng/wlan-ng-modules_0.2.7.bb"
# from [4f3ab359bbe31bfb1b631b303c97ad63c2f981e3]
# to [eaf518590d6acebdd35fcd19d1ce91cc2c6fc805]
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
# from [41111959110e4d02e8cbcb965b17cd1d2494d5b9]
# to [243bcb1cf8f6d81256ea0e31b07b0478b9bb5174]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [bc48ac913bf5619e2ef613e1dcc2f78c81bcd221]
# to [31f806960351e14859e325b9073986126a23ca3a]
#
# patch "packages/zaurus-updater/akita/updater.sh"
# from [71a4dadcc6448fcc9911e0f977a6e9e4fa0c4e5f]
# to [832116bb9a867c6d1150b57f11ad9893965cb035]
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [d49404556e2187447d41a9c4c22080442b70d001]
# to [dcc33e7466ed242c616fb02fb777ba2dd39a1eba]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [0841e26124c537013227ff1ca2c7645139dfb6e4]
# to [ad00179ab36c465f5519eb89cc47983be97b1ea6]
#
============================================================
--- packages/autofs/autofs-4.1.4/no-bash.patch 4eb3ed80313c234e6bd2311751e62211135fe24e
+++ packages/autofs/autofs-4.1.4/no-bash.patch 4eb3ed80313c234e6bd2311751e62211135fe24e
@@ -0,0 +1,18 @@
+diff -Naur autofs-4.1.4/samples.orig/auto.net autofs-4.1.4/samples/auto.net
+--- autofs-4.1.4/samples.orig/auto.net 2007-11-21 11:29:57.000000000 -0600
++++ autofs-4.1.4/samples/auto.net 2007-11-21 11:30:27.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # $Id: auto.net,v 1.8 2005/04/05 13:02:09 raven Exp $
+
+diff -Naur autofs-4.1.4/samples.orig/auto.smb autofs-4.1.4/samples/auto.smb
+--- autofs-4.1.4/samples.orig/auto.smb 2007-11-21 11:29:57.000000000 -0600
++++ autofs-4.1.4/samples/auto.smb 2007-11-21 11:30:34.000000000 -0600
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ # $Id: auto.smb,v 1.3 2005/04/05 13:02:09 raven Exp $
+
============================================================
--- packages/cryptsetup/cryptsetup_1.0.5.bb 2523bf24ec0cfefc7fdd530d42d221ada86b4894
+++ packages/cryptsetup/cryptsetup_1.0.5.bb 2523bf24ec0cfefc7fdd530d42d221ada86b4894
@@ -0,0 +1,21 @@
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php
+# for a copy of the license)
+
+DESCRIPTION = "cryptsetup with luks support creates and manages encrypted containers and partitions"
+HOMEPAGE = "http://luks.endorphin.org/"
+SECTION = "console"
+LICENSE = "GPL"
+DEPENDS = "e2fsprogs-libs device-mapper libgcrypt popt"
+RRECOMMENDS = "kernel-module-aes \
+ kernel-module-dm-crypt \
+ kernel-module-md5 \
+ kernel-module-cbc \
+ kernel-module-sha256 \
+ "
+PR = "r2"
+
+SRC_URI = "http://luks.endorphin.org/source/cryptsetup-${PV}.tar.bz2"
+
+inherit autotools
+
============================================================
--- packages/gcc/gcc-4.1.2/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-4.1.2/pr34130.patch 23564cf74db7c5330d103f2b44e167ad2ef97eba
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c 2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c 2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+ }
+ break;
+ }
+- /* FALLTHROUGH */
++ /* If the constant is negative, we cannot simplify this. */
++ if (tree_int_cst_sgn (c) == -1)
++ break;
++ /* FALLTHROUGH */
+ case NEGATE_EXPR:
+ if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
============================================================
--- 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/initscripts/initscripts-1.0/slugos/bootclean.sh 5ee9d16c6ee82710382962de81f55e894d4eb076
+++ packages/initscripts/initscripts-1.0/slugos/bootclean.sh 5ee9d16c6ee82710382962de81f55e894d4eb076
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# bootclean.sh - Cleans out /tmp, /var/run, and /var/lock
+# This script should run after mountall.sh in runlevel S.
+#
+# This script relies upon find and xargs, and is largely
+# based on the equivalent script in the Debian releases.
+
+. /etc/default/rcS
+
+# Completely clean out everything in /tmp, but do not walk into
+# anything that might be mounted beneath /tmp. If /tmp is not
+# a directory, ignore this (it's probably a symlink to
+# /var/volatiles/tmp, and we best leave it alone).
+
+if [ -d /tmp -a ! -L /tmp ] ; then
+ echo "bootclean.sh: Cleaning /tmp..."
+ cd /tmp || { echo "bootclean.sh: unable to cd to /tmp." ; return 1 ; }
+ find . -depth -xdev ! -type d -print0 | xargs -0r rm -f --
+ find . -depth -xdev -type d ! -name . -empty -exec rmdir \{\} \;
+else
+ echo "bootclean.sh: Skipping /tmp (not a directory)..."
+fi
+
+# Now clean out /var/lock.
+
+if [ -d /var/lock -a ! -L /var/lock ] ; then
+ echo "bootclean.sh: Cleaning /var/lock..."
+ cd /var/lock || { echo "bootclean.sh: unable to cd to /var/lock." ; return 1 ; }
+ find . -xdev ! -type d -print0 | xargs -0r rm -f --
+else
+ echo "bootclean.sh: Skipping /var/lock (not a directory)..."
+fi
+
+# Now clean out /var/run.
+
+if [ -d /var/run -a ! -L /var/run ] ; then
+ echo "bootclean.sh: Cleaning /var/run..."
+ cd /var/run || { echo "bootclean.sh: unable to cd to /var/run." ; return 1 ; }
+ find . -xdev ! -type d ! -name utmp -print0 | xargs -0r rm -f --
+else
+ echo "bootclean.sh: Skipping /var/run (not a directory)..."
+fi
+
+# done.
+
+exit 0
============================================================
--- packages/initscripts/initscripts-1.0/slugos/volatiles 018cdf15373dbc496fd5aabfbb165ecaab713d78
+++ packages/initscripts/initscripts-1.0/slugos/volatiles 018cdf15373dbc496fd5aabfbb165ecaab713d78
@@ -0,0 +1,36 @@
+# This configuration file lists filesystem objects that sh%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list