[oe-commits] org.oe.dev merge of '05c8ac666734fffe4be207c184a8d6ec410c203f'
koen commit
oe at amethyst.openembedded.net
Mon Sep 1 18:33:01 UTC 2008
merge of '05c8ac666734fffe4be207c184a8d6ec410c203f'
and 'cdd9d1c543126b02dd14925c940ec6a31e071be8'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 42b443ef8580ee734b2f0f0401489eef57a70a16
ViewMTN: http://monotone.openembedded.org/revision/info/42b443ef8580ee734b2f0f0401489eef57a70a16
Files:
1
packages/initscripts/initscripts-1.0/slugos/mountall.sh
packages/initscripts/initscripts-slugos_1.0.bb
packages/slugos-init/files/boot/disk
packages/slugos-init/files/conffiles
packages/slugos-init/files/functions
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_5.0.bb
packages/udev/files/slugos/mount.sh
packages/udev/udev_100.bb
conf/bitbake.conf
contrib/angstrom/source-mirror.txt
Diffs:
#
# mt diff -r05c8ac666734fffe4be207c184a8d6ec410c203f -r42b443ef8580ee734b2f0f0401489eef57a70a16
#
#
#
# patch "packages/initscripts/initscripts-1.0/slugos/mountall.sh"
# from [d53ec5b8db4e854e32ae7bc9a2c949e2bb0d38cc]
# to [7b729b7c0755345fedcc2586ee7c127dd42f5adb]
#
# patch "packages/initscripts/initscripts-slugos_1.0.bb"
# from [b53ecc7ee0a048c71332f56fb4175bdb09913fc2]
# to [a45dcb049471fd59bbe6431762f87bdc58a2f9e6]
#
# patch "packages/slugos-init/files/boot/disk"
# from [2812a8e183761c88f764ab143d6e65cf1bfc8290]
# to [0200f93a1bfe7463dd853dc483839fa8d9e82468]
#
# patch "packages/slugos-init/files/conffiles"
# from [f1ace3f1649eab164c7a09a2b6e017f748b39dfa]
# to [3df2fad872347d8772f93d6c6d75a35000f3d95c]
#
# patch "packages/slugos-init/files/functions"
# from [3a8a43e4f47ba0bc13a780d41ba39abc0a55d2e5]
# to [b8e782b31617c72e20882f46661e89453ebb364b]
#
# patch "packages/slugos-init/files/turnup"
# from [d94a8247eae67fe247bce151f90da0b92e8c9617]
# to [6e17652b7fc5d80ed745149b022f480d3e06c35c]
#
# patch "packages/slugos-init/slugos-init_5.0.bb"
# from [9a455a4cc8bd81f72ac4bedd0d75467081204750]
# to [f1d83bb6efd47859e2fa618a8f46c7956a5305a5]
#
# patch "packages/udev/files/slugos/mount.sh"
# from [9e59c21651fc2f3094b4be636f3d58bf29c2b0c7]
# to [5ebced43f93b2ff039b0edda68aa50b7e9e594a9]
#
# patch "packages/udev/udev_100.bb"
# from [72309dab97aeccd4e512bd8d643d6467df4340e8]
# to [fdf11aa59935fad400cc282a6f93096e726bef47]
#
============================================================
--- packages/initscripts/initscripts-1.0/slugos/mountall.sh d53ec5b8db4e854e32ae7bc9a2c949e2bb0d38cc
+++ packages/initscripts/initscripts-1.0/slugos/mountall.sh 7b729b7c0755345fedcc2586ee7c127dd42f5adb
@@ -5,7 +5,16 @@
#
. /etc/default/rcS
+# If the right stuff exists, attempt to automatically assemble any
+# RAID devices that might be configured.
#
+if test -x /sbin/mdadm
+then
+ test "$VERBOSE" != no && echo "Assembling RAID devices..."
+ mdadm --assemble --scan --auto=md
+fi
+
+#
# Mount local filesystems in /etc/fstab. For some reason, people
# might want to mount "proc" several times, and mount -v complains
# about this. So we mount "proc" filesystems without -v.
============================================================
--- packages/initscripts/initscripts-slugos_1.0.bb b53ecc7ee0a048c71332f56fb4175bdb09913fc2
+++ packages/initscripts/initscripts-slugos_1.0.bb a45dcb049471fd59bbe6431762f87bdc58a2f9e6
@@ -16,7 +16,7 @@ RDEPENDS = ""
# All other standard definitions inherited from initscripts
# Except the PR which is hacked here. The format used is
# a suffix
-PR := "${PR}.14"
+PR := "${PR}.15"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
============================================================
--- packages/slugos-init/files/boot/disk 2812a8e183761c88f764ab143d6e65cf1bfc8290
+++ packages/slugos-init/files/boot/disk 0200f93a1bfe7463dd853dc483839fa8d9e82468
@@ -24,9 +24,21 @@ then
# waiting for disk
if test "$sleep" -gt 0
then
- echo "Waiting $sleep seconds for disk"
+ echo "boot: waiting $sleep seconds for disk"
sleep "$sleep"
fi
+ # Attempt to assemble the RAID if necessary
+ if (echo $device | grep -q "^/dev/md")
+ then
+ if test -n "$MDUUID"
+ then
+ echo "boot: assembling RAID array (UUID)"
+ mdadm -Acpartitions --auto=md --uuid="$MDUUID" $device
+ else
+ echo "boot: assembling RAID array (config file)"
+ mdadm -As --auto=md $device
+ fi
+ fi
#
# fire the boot
echo "boot: rootfs: mount $* $device [$UUID]"
============================================================
--- packages/slugos-init/files/conffiles f1ace3f1649eab164c7a09a2b6e017f748b39dfa
+++ packages/slugos-init/files/conffiles 3df2fad872347d8772f93d6c6d75a35000f3d95c
@@ -2,7 +2,7 @@
# Known SlugOS configuration files. These files are preserved on
# a flash upgrade. Other configuration files, found from:
#
-# /usr/lib/ipkg/*.conffiles
+# /usr/lib/opkg/*.conffiles
# /etc/*.conf
#
# are preserved too with an operation of 'diff' if they have been
============================================================
--- packages/slugos-init/files/functions 3a8a43e4f47ba0bc13a780d41ba39abc0a55d2e5
+++ packages/slugos-init/files/functions b8e782b31617c72e20882f46661e89453ebb364b
@@ -191,6 +191,7 @@ minimaldevnodes(){
minimaldevnodes(){
[ -c "$1/dev/console" ] || mknod -m 600 "$1/dev/console" c 5 1 || return 1
[ -c "$1/dev/null" ] || mknod -m 666 "$1/dev/null" c 1 3 || return 1
+ [ -c "$1/dev/tty0" ] || mknod -m 644 "$1/dev/tty0" c 4 0 || return 1
return 0
}
#
============================================================
--- packages/slugos-init/files/turnup d94a8247eae67fe247bce151f90da0b92e8c9617
+++ packages/slugos-init/files/turnup 6e17652b7fc5d80ed745149b022f480d3e06c35c
@@ -274,7 +274,13 @@ setup_dev() {
# /dev/null
# syslog, and maybe other things, only work if fd 1 is valid, therefore
# we must create these devices here...
- makedevs --root="$1" --devtable="$2"
+ # (if makedevs is a symlink, it's the busybox version, different syntax)
+ if [ -h /sbin/makedevs ]
+ then
+ makedevs -d "$2" "$1"
+ else
+ makedevs --root="$1" --devtable="$2"
+ fi
:>"$1"/dev/.noram
return 0
}
@@ -290,7 +296,13 @@ setup_bootdev() {
}
# NOTE: this fails silently with 0 return code(!) when a directory
# does not exist yet things are created within it.
- makedevs -r "$1" -D "$2"
+ # (if makedevs is a symlink, it's the busybox version, different syntax)
+ if [ -h /sbin/makedevs ]
+ then
+ makedevs -d "$2" "$1"
+ else
+ makedevs -r "$1" -D "$2"
+ fi
}
#
@@ -432,6 +444,7 @@ boot_rootfs() {
sleep="$3"
device="$4"
uuid=
+ mduuid=
# test this first as the test does not depend on the correctness
# of the other arguments
@@ -452,6 +465,11 @@ boot_rootfs() {
return 1
}
uuid="$3"
+ if (echo "$device" | grep -q '^/dev/md')
+ then
+ # FIXME: should use awk to do the below extraction
+ mduuid=`mdadm --detail --brief "$device" | sed 's/^.*UUID=//'`
+ fi
shift 3;;
nfs) shift 2;;
flash) ;;
@@ -493,6 +511,7 @@ boot_rootfs() {
echo 'leds beep'
test "$sleep" -gt 0 && echo -n "sleep='$sleep' "
test -n "$uuid" && echo -n "UUID='$uuid' "
+ test -n "$mduuid" && echo -n "MDUUID='$mduuid' "
echo -n "exec '/boot/$type' '$device'"
for opt in "$@"
do
============================================================
--- packages/slugos-init/slugos-init_5.0.bb 9a455a4cc8bd81f72ac4bedd0d75467081204750
+++ packages/slugos-init/slugos-init_5.0.bb f1d83bb6efd47859e2fa618a8f46c7956a5305a5
@@ -4,7 +4,7 @@ RDEPENDS = "busybox devio"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r1.2"
+PR = "r2"
SRC_URI = "file://boot/flash \
file://boot/disk \
============================================================
--- packages/udev/files/slugos/mount.sh 9e59c21651fc2f3094b4be636f3d58bf29c2b0c7
+++ packages/udev/files/slugos/mount.sh 5ebced43f93b2ff039b0edda68aa50b7e9e594a9
@@ -10,6 +10,12 @@ name="`basename "$DEVNAME"`"
UMOUNT="/bin/umount"
name="`basename "$DEVNAME"`"
+if ( blkid "$DEVNAME" | grep -q 'TYPE="mdraid"' )
+then
+ logger "udev/mount.sh" "[$DEVNAME] is a member of an array, ignoring"
+ exit 0
+fi
+
for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
do
if ( echo "$DEVNAME" | grep -q "$line" )
============================================================
--- packages/udev/udev_100.bb 72309dab97aeccd4e512bd8d643d6467df4340e8
+++ packages/udev/udev_100.bb fdf11aa59935fad400cc282a6f93096e726bef47
@@ -9,7 +9,7 @@ needed to link programs with libvolume_i
DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
needed to link programs with libvolume_id."
-PR = "r11"
+PR = "r12"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://noasmlinkage.patch;patch=1 \
#
# mt diff -rcdd9d1c543126b02dd14925c940ec6a31e071be8 -r42b443ef8580ee734b2f0f0401489eef57a70a16
#
#
#
# patch "conf/bitbake.conf"
# from [5289f3b5b95939b1d3d267c6b93e7a17f6548463]
# to [40a62478ed5987c72c6fe7e9352dc04a7e7522d9]
#
# patch "contrib/angstrom/source-mirror.txt"
# from [2e9ab07fc28af71188db82b6db0ad97fdacc72fe]
# to [0ab32adf1f05ccfce646a98050e493f746333d7f]
#
============================================================
--- conf/bitbake.conf 5289f3b5b95939b1d3d267c6b93e7a17f6548463
+++ conf/bitbake.conf 40a62478ed5987c72c6fe7e9352dc04a7e7522d9
@@ -215,6 +215,7 @@ BZRDIR = "${CO_DIR}/bzr"
SVNDIR = "${CO_DIR}/svn"
GITDIR = "${CO_DIR}/git"
BZRDIR = "${CO_DIR}/bzr"
+HGDIR = "${CO_DIR}/hg"
STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}"
WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}"
@@ -449,6 +450,7 @@ FETCHCMD_bzr = "/usr/bin/env bzr"
FETCHCMD_cvs = "/usr/bin/env cvs"
FETCHCMD_wget = "/usr/bin/env wget -t 5"
FETCHCMD_bzr = "/usr/bin/env bzr"
+FETCHCMD_hg = "/usr/bin/env hg"
FETCHCOMMAND = "ERROR, this must be a BitBake bug"
FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
============================================================
--- contrib/angstrom/source-mirror.txt 2e9ab07fc28af71188db82b6db0ad97fdacc72fe
+++ contrib/angstrom/source-mirror.txt 0ab32adf1f05ccfce646a98050e493f746333d7f
@@ -3,6 +3,8 @@
rsync ~/OE/downloads/ angstrom at linuxtogo.org:~/website/unstable/sources/ -av \
--exclude "*.md5" \
--exclude "svn" \
+ --exclude "hg" \
+ --exclude "bzr" \
--exclude "cvs" \
--exclude "git" \
--exclude "umac.ko" \
More information about the Openembedded-commits
mailing list