[oe-commits] org.oe.dev merge of '1ee552cc6f52635092d975d976326b9977dfc32e'

[oe commit]

merge of '1ee552cc6f52635092d975d976326b9977dfc32e'
     and '42b443ef8580ee734b2f0f0401489eef57a70a16'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 0110086492a20d06f0650647777f8a58951252c2
ViewMTN: http://monotone.openembedded.org/revision/info/0110086492a20d06f0650647777f8a58951252c2
Files:
1
conf/bitbake.conf
contrib/angstrom/source-mirror.txt
packages/tasks/task-slugos.bb
Diffs:

#
# mt diff -r1ee552cc6f52635092d975d976326b9977dfc32e -r0110086492a20d06f0650647777f8a58951252c2
#
#
#
# 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" \


#
# mt diff -r42b443ef8580ee734b2f0f0401489eef57a70a16 -r0110086492a20d06f0650647777f8a58951252c2
#
#
#
# patch "packages/tasks/task-slugos.bb"
#  from [3b4b6bd42f720b35aec589f38a0f20c8bc0b38a3]
#    to [d7893ccc3bda41a34d284b184607af64d0ea806b]
#
============================================================
--- packages/tasks/task-slugos.bb	3b4b6bd42f720b35aec589f38a0f20c8bc0b38a3
+++ packages/tasks/task-slugos.bb	d7893ccc3bda41a34d284b184607af64d0ea806b
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r20"
+PR = "r21"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 ALLOW_EMPTY = "1"
@@ -21,14 +21,10 @@ SLUGOS_STANDARD_RRECOMMENDS = ""
 SLUGOS_STANDARD_RDEPENDS = ""
 SLUGOS_STANDARD_RRECOMMENDS = ""
 
-# diff, cpio and find are required for turnup and ipkg.
+# The full cpio (non-busybox) is required for turnup and sysconfig.
 SLUGOS_STANDARD_RRECOMMENDS += "\
 cpio \
 "
-## SlugOS 5.0 -- uses busybox diff & find; cpio still needs -p and ability to
-## create CRC archives before we can use busybox cpio - MJW
-#diffutils \
-#findutils \
 
 # These lines add support for formatting ext2 and ext3 file systems
 # on a hard disk attached to the NSLU2.  ext3 is the standard Linux
@@ -41,12 +37,6 @@ e2fsprogs-blkid \
 e2fsprogs-blkid \
 "
 
-# These lines add support for an X/Y/ZModem package called lrzsz
-# (this is of use for people with modified NSLU2 hardware which
-# supports a serial port.)
-## SlugOS 5.0 -- uses busybox rx command - MJW
-#SLUGOS_STANDARD_RRECOMMENDS += "lrzsz"
-
 # Filesystem selection.  Adding entries here adds the module to the
 # image.  The module must be built as part of nslu2-kernel (i.e. it
 # must be specified as a module in the defconfig file).  The NLS
@@ -100,8 +90,17 @@ kernel-module-via-velocity \
 kernel-module-ixp4xx-mac \
 kernel-module-ixp4xx-qmgr \
 kernel-module-via-velocity \
+kernel-module-netconsole \
 "
 
+# Add packages and modules required for RAID-1 support
+# (temporary, intended only to facilitate testing - MJW)
+SLUGOS_STANDARD_RRECOMMENDS += "\
+mdadm \
+kernel-module-md-mod \
+kernel-module-raid1 \
+"
+
 # Other candidate packages that have been considered and
 # are intentionally excluded from the base flash image.
 #
@@ -110,10 +109,10 @@ kernel-module-via-velocity \
 # kernel-module-isofs \
 # kernel-module-udf \
 # kernel-module-loop \
-# kernel-module-netconsole \
+# wireless-tools \
 # wpa-supplicant \
 # zd1211-firmware kernel-module-zd1211rw \
-# madwifi-ng-modules madwifi-ng-tools wireless-tools \
+# madwifi-ng-modules madwifi-ng-tools \
 
 DISTRO_EXTRA_DEPENDS ?= ""
 DEPENDS += "${DISTRO_EXTRA_DEPENDS}"