[oe-commits] org.oe.dev merge of '1f9ecef5aa14483fc6f8eb9ea98c7a709ec92c5a'
Laibsch commit
oe at amethyst.openembedded.net
Mon Sep 1 18:22:26 UTC 2008
merge of '1f9ecef5aa14483fc6f8eb9ea98c7a709ec92c5a'
and 'a9ff99e803ab2437983f68e64198879cfb336247'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 868bad9c652735d85f63ddb946a678fbb5bf738a
ViewMTN: http://monotone.openembedded.org/revision/info/868bad9c652735d85f63ddb946a678fbb5bf738a
Files:
1
packages/initscripts/initscripts-slugos_1.0.bb
packages/module-init-tools/module-init-tools-cross_3.2.2.bb
packages/module-init-tools/module-init-tools_3.2.2.bb
packages/slugos-init/files/boot/ram
packages/tasks/task-slugos.bb
packages/update-modules/update-modules_1.0.bb
conf/distro/include/insane-srcrevs.inc
conf/distro/include/sane-srcrevs.inc
Diffs:
#
# mt diff -r1f9ecef5aa14483fc6f8eb9ea98c7a709ec92c5a -r868bad9c652735d85f63ddb946a678fbb5bf738a
#
#
#
# patch "packages/initscripts/initscripts-slugos_1.0.bb"
# from [5eb0daef896570641f9a484cf20496c3d0449536]
# to [b53ecc7ee0a048c71332f56fb4175bdb09913fc2]
#
# patch "packages/module-init-tools/module-init-tools-cross_3.2.2.bb"
# from [c9d7c86bbb96b9b13a6e4e70ad5a748284dff93a]
# to [403a83385ec40e5b70ece997280bfc617b0e9986]
#
# patch "packages/module-init-tools/module-init-tools_3.2.2.bb"
# from [920963b27f9d5c22fc6f8168443c5ed59b2dcd3c]
# to [d90ae96f8ebc510322f0e4fef9734348b427b40a]
#
# patch "packages/slugos-init/files/boot/ram"
# from [0196e2404034a031dd316f8be685fd7072e05d4a]
# to [6d95501a22c4d82ed70ec932d3f592ec7d6fce45]
#
# patch "packages/tasks/task-slugos.bb"
# from [fe69b335fe12d79a158040a4ad67ab291c6c5e87]
# to [3b4b6bd42f720b35aec589f38a0f20c8bc0b38a3]
#
# patch "packages/update-modules/update-modules_1.0.bb"
# from [ecad26ff3e4ce8d15f0e2e0c065189034d9a4eac]
# to [0af083cf5539038cf89aef22f7ab398448095010]
#
============================================================
--- packages/initscripts/initscripts-slugos_1.0.bb 5eb0daef896570641f9a484cf20496c3d0449536
+++ packages/initscripts/initscripts-slugos_1.0.bb b53ecc7ee0a048c71332f56fb4175bdb09913fc2
@@ -7,10 +7,16 @@ RCONFLICTS = "initscripts"
include initscripts_${PV}.bb
RCONFLICTS = "initscripts"
+
+# SlugOS uses the busybox makedevs, so until that dependency gets virtualized
+# the below lines serve to remove the dependency on the full makedevs package:
+DEPENDS = ""
+RDEPENDS = ""
+
# All other standard definitions inherited from initscripts
# Except the PR which is hacked here. The format used is
# a suffix
-PR := "${PR}.13"
+PR := "${PR}.14"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
============================================================
--- packages/module-init-tools/module-init-tools-cross_3.2.2.bb c9d7c86bbb96b9b13a6e4e70ad5a748284dff93a
+++ packages/module-init-tools/module-init-tools-cross_3.2.2.bb 403a83385ec40e5b70ece997280bfc617b0e9986
@@ -4,6 +4,10 @@ PROVIDES += "virtual/${TARGET_PREFIX}dep
DEFAULT_PREFERENCE = "0"
PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
+# Remove the RDEPENDS we picked up from the "require";
+# it's simply extraneous for the cross package
+RDEPENDS_${PN} = ""
+
EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
do_stage () {
============================================================
--- packages/module-init-tools/module-init-tools_3.2.2.bb 920963b27f9d5c22fc6f8168443c5ed59b2dcd3c
+++ packages/module-init-tools/module-init-tools_3.2.2.bb d90ae96f8ebc510322f0e4fef9734348b427b40a
@@ -3,7 +3,7 @@ SECTION = "base"
the same function that the modutils package serves for Linux 2.4."
LICENSE = "GPL"
SECTION = "base"
-PR = "r4"
+PR = "r5"
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
RDEPENDS_${PN} += "module-init-tools-depmod"
============================================================
--- packages/slugos-init/files/boot/ram 0196e2404034a031dd316f8be685fd7072e05d4a
+++ packages/slugos-init/files/boot/ram 6d95501a22c4d82ed70ec932d3f592ec7d6fce45
@@ -28,9 +28,12 @@ then
# filter out boot (with zimage), linuxrc and anything
# below /var, keep dev or the boot will fail (note that
# nothing is mounted this early in the bootstrap).
- find . -mount -print |
+ find . -xdev -print |
sed '\@^./boot/@d;\@^./boot$@d;\@^./linuxrc at d;\@^./var/@d' |
cpio -p -d -m -u /mnt
+ # busybox find with -xdev will not print the name of the
+ # mountpoint, so create the empty dir manually if required.
+ test -d /mnt/mnt || mkdir /mnt/mnt
# checkmount checks for sh, init and no .recovery plus
# either mnt or initrd, mnt must exist!
if checkmount /mnt
============================================================
--- packages/tasks/task-slugos.bb fe69b335fe12d79a158040a4ad67ab291c6c5e87
+++ packages/tasks/task-slugos.bb 3b4b6bd42f720b35aec589f38a0f20c8bc0b38a3
@@ -6,7 +6,7 @@ LICENSE = "MIT"
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r19"
+PR = "r20"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
ALLOW_EMPTY = "1"
@@ -119,6 +119,8 @@ DISTRO_EXTRA_RDEPENDS ?= ""
DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
DISTRO_EXTRA_RDEPENDS ?= ""
+
+## This comment block is temporary, to be removed once SlugOS 5.0 stabilizes
##RDEPENDS += "\
## kernel ixp4xx-npe \
## base-files base-passwd netbase \
@@ -138,13 +140,14 @@ DISTRO_EXTRA_RDEPENDS ?= ""
## util-linux-* utilities are now replaced by busybox tools. Also, ipkg
## is replaced by a trimmed-down version of opkg (no package signatures,
## and it uses the busybox wget command instead of libcurl - MJW
+## SlugOS 5.0 - module-init-tools replaced by busybox as well - MJW
RDEPENDS += "\
kernel ixp4xx-npe \
base-files base-passwd netbase \
busybox initscripts-slugos slugos-init \
update-modules sysvinit udev \
- module-init-tools modutils-initscripts \
+ modutils-initscripts \
opkg-collateral opkg-nogpg-nocurl \
libgcc \
beep \
============================================================
--- packages/update-modules/update-modules_1.0.bb ecad26ff3e4ce8d15f0e2e0c065189034d9a4eac
+++ packages/update-modules/update-modules_1.0.bb 0af083cf5539038cf89aef22f7ab398448095010
@@ -3,7 +3,7 @@ RDEPENDS = "${@base_contains("MACHINE_FE
LICENSE = "GPLv2"
PACKAGE_ARCH = "all"
RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
-PR = "r7"
+PR = "r8"
SRC_URI = "file://update-modules"
@@ -28,3 +28,10 @@ RDEPENDS_unslung = ""
# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's
# not worth the effort to do that, so just overlook the next line.
RDEPENDS_unslung = ""
+
+# The SlugOS distro is testing the use of the busybox mod* utilities.
+# If that works out, we should create a virtual/update-modules, and
+# let the distros select if they want busybox, or some other package
+# to provide it. Until then, the following line just removes the
+# unwanted dependencies for SlugOS.
+RDEPENDS_slugos = ""
#
# mt diff -ra9ff99e803ab2437983f68e64198879cfb336247 -r868bad9c652735d85f63ddb946a678fbb5bf738a
#
#
#
# patch "conf/distro/include/insane-srcrevs.inc"
# from [cbc144484de6ac4d699d0a609a011f4f1f04d2bf]
# to [b63c5009601e09f5e772898ae807a0c241d756d4]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [e7465cf9ab0b123967977983ac03749e2539f375]
# to [c5cf1f45bce89c37cbb4f5cc7b166d248a732d3e]
#
============================================================
--- conf/distro/include/insane-srcrevs.inc cbc144484de6ac4d699d0a609a011f4f1f04d2bf
+++ conf/distro/include/insane-srcrevs.inc b63c5009601e09f5e772898ae807a0c241d756d4
@@ -86,7 +86,7 @@ SRCREV_pn-sjf2410-linux-native ?= "${AUT
SRCREV_pn-psplash ?= "${AUTOREV}"
SRCREV_pn-settings-daemon ?= "${AUTOREV}"
SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
-SRCREV_pn-sphyrna ?= "${AUTOREV}"
+SRCREV_pn-sphyrna-python ?= "${AUTOREV}"
SRCREV_pn-webkit-gtk ?= "${AUTOREV}"
SRCREV_pn-xoo ?= "${AUTOREV}"
SRCREV_pn-mplayer ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc e7465cf9ab0b123967977983ac03749e2539f375
+++ conf/distro/include/sane-srcrevs.inc c5cf1f45bce89c37cbb4f5cc7b166d248a732d3e
@@ -163,7 +163,7 @@ SRCREV_pn-sjf2410-linux-native ?= "4268"
SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-settings-daemon ?= "2006"
SRCREV_pn-sjf2410-linux-native ?= "4268"
-SRCREV_pn-sphyrna ?= "45"
+SRCREV_pn-sphyrna-python ?= "45"
SRCREV_pn-tmut ?= "60"
SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
More information about the Openembedded-commits
mailing list