[oe-commits] org.oe.dev COMPATIBLE_MACHINE=nslu2: various packages updated
rwhitby commit
openembedded-commits at lists.openembedded.org
Mon Nov 13 11:00:10 UTC 2006
COMPATIBLE_MACHINE=nslu2: various packages updated
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 3b647ef2a86ba81e73d0fe2a840a80eaa43811ca
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3b647ef2a86ba81e73d0fe2a840a80eaa43811ca
Files:
1
packages/busybox/slingbox_1.00.bb
packages/busybox/slingbox_1.1.3.bb
packages/busybox/slingbox_1.2.2.bb
packages/images/unslung-image.bb
packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
packages/upslug/upslug-native_1.0.bb
packages/upslug/upslug-native_cvs.bb
Diffs:
#
# mt diff -rbbfd8e7a66d37fed5a426871f43542115fe9506b -r3b647ef2a86ba81e73d0fe2a840a80eaa43811ca
#
#
#
# patch "packages/busybox/slingbox_1.00.bb"
# from [00548a509e238a381810847cd8afa5dffbbdb35d]
# to [da2515cad5e4ce417f57f6bfa02374a31c9adc5c]
#
# patch "packages/busybox/slingbox_1.1.3.bb"
# from [3fc6529d1d84565ef96c59f03db5711d0b7d0af7]
# to [32aca9d33ed07d19585ded0d7dc284ab9c5f1774]
#
# patch "packages/busybox/slingbox_1.2.2.bb"
# from [b83dc87da0c9b066d34397d730c433c98c881da5]
# to [7b5e7cd7854aa3d552c6a3c6fef1f9163dc2227d]
#
# patch "packages/images/unslung-image.bb"
# from [eb24805749a1f6346128fd7ff3c6d6d6bff649e5]
# to [388aa7415f2cc3ed5d0ef372cbb5e332f4165b8e]
#
# patch "packages/linux/unslung-kernel_2.4.22.l2.3r63.bb"
# from [36029fb569b63bf975dd4656c44cc3363595adad]
# to [47a1aceb0a837508fb86c04ab9586400d45a3e5a]
#
# patch "packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb"
# from [66fb9ca5e1aaa626ed8e6d68606fdd9c82bb3d23]
# to [9461f60e0cada163ae639077c522bde341f9c8e7]
#
# patch "packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb"
# from [b22e258010d05d82f39d87dd924ad3ac9bb25ca8]
# to [bf607a99769f09e3ce1f8709db282d711613599d]
#
# patch "packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb"
# from [a8d8945c3c8454bbae8b780f83469559f85903cb]
# to [1314757b2bc700225c1c6e759fdb7bd301249f1e]
#
# patch "packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb"
# from [7ad176f0a7893c493f30362e7026fda2aa706d07]
# to [87419f881d14083e64bf10889a3cc6cfc021559e]
#
# patch "packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb"
# from [3c03dfcaf01eeff3ec571a017cd57e762c514f6b]
# to [b6544af86d48626e2e00d18ccab20b9c65d04e8f]
#
# patch "packages/upslug/upslug-native_1.0.bb"
# from [966014b51d826075dab3fb91df188450a156d4e1]
# to [49670665160cb56efe215e77d2742312621ea10d]
#
# patch "packages/upslug/upslug-native_cvs.bb"
# from [b49633c12d3814ce737eb05efd23c47d27be8ac8]
# to [897a73c3262ce63a59ff99c22edf87eb79a17f46]
#
============================================================
--- packages/busybox/slingbox_1.00.bb 00548a509e238a381810847cd8afa5dffbbdb35d
+++ packages/busybox/slingbox_1.00.bb da2515cad5e4ce417f57f6bfa02374a31c9adc5c
@@ -1,10 +1,11 @@ PRIORITY = "required"
DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
to enable ipkg to run on an Unslung NSLU2 device."
HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r9"
+PR = "r10"
+COMPATIBLE_MACHINE = "nslu2"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://defconfig \
@@ -13,12 +14,6 @@ S = "${WORKDIR}/busybox-${PV}"
S = "${WORKDIR}/busybox-${PV}"
-python () {
- # Don't build slingbox unless we're targeting an nslu2
- if bb.data.getVar("MACHINE", d, 1) != "nslu2":
- raise bb.parse.SkipPackage("switchbox only builds for the Linksys NSLU2")
-}
-
export EXTRA_CFLAGS = "${CFLAGS}"
EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
============================================================
--- packages/busybox/slingbox_1.1.3.bb 3fc6529d1d84565ef96c59f03db5711d0b7d0af7
+++ packages/busybox/slingbox_1.1.3.bb 32aca9d33ed07d19585ded0d7dc284ab9c5f1774
@@ -1,10 +1,11 @@ PRIORITY = "required"
DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
to enable ipkg to run on an Unslung NSLU2 device."
HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r2"
+PR = "r3"
+COMPATIBLE_MACHINE = "nslu2"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://defconfig \
@@ -15,12 +16,6 @@ S = "${WORKDIR}/busybox-${PV}"
S = "${WORKDIR}/busybox-${PV}"
-python () {
- # Don't build slingbox unless we're targeting an nslu2
- if bb.data.getVar("MACHINE", d, 1) != "nslu2":
- raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2")
-}
-
export EXTRA_CFLAGS = "${CFLAGS}"
EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
============================================================
--- packages/busybox/slingbox_1.2.2.bb b83dc87da0c9b066d34397d730c433c98c881da5
+++ packages/busybox/slingbox_1.2.2.bb 7b5e7cd7854aa3d552c6a3c6fef1f9163dc2227d
@@ -1,10 +1,11 @@ PRIORITY = "required"
DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
to enable ipkg to run on an Unslung NSLU2 device."
HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r3"
+PR = "r4"
+COMPATIBLE_MACHINE = "nslu2"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://defconfig \
@@ -17,12 +18,6 @@ S = "${WORKDIR}/busybox-${PV}"
S = "${WORKDIR}/busybox-${PV}"
-python () {
- # Don't build slingbox unless we're targeting an nslu2
- if bb.data.getVar("MACHINE", d, 1) != "nslu2":
- raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2")
-}
-
export EXTRA_CFLAGS = "${CFLAGS}"
EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
============================================================
--- packages/images/unslung-image.bb eb24805749a1f6346128fd7ff3c6d6d6bff649e5
+++ packages/images/unslung-image.bb 388aa7415f2cc3ed5d0ef372cbb5e332f4165b8e
@@ -1,5 +1,6 @@ LICENSE = MIT
LICENSE = MIT
-PR = "r24"
+PR = "r25"
+COMPATIBLE_MACHINE = "nslu2"
IMAGE_BASENAME = "unslung"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
@@ -119,10 +120,3 @@ unslung_clean_image () {
# #### End of Hack!
}
-
-python () {
- # Don't build unslung images unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- if mach != 'nslu2':
- raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
============================================================
--- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb 36029fb569b63bf975dd4656c44cc3363595adad
+++ packages/linux/unslung-kernel_2.4.22.l2.3r63.bb 47a1aceb0a837508fb86c04ab9586400d45a3e5a
@@ -1,4 +1,5 @@ SECTION = "kernel"
SECTION = "kernel"
+COMPATIBLE_MACHINE = "nslu2"
require nslu2-linksys-kernel_2.4.22.bb
@@ -27,5 +28,3 @@ FILESPATH = "${@base_set_filespath([ '${
${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-COMPATIBLE_MACHINE = "nslu2"
============================================================
--- packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb 66fb9ca5e1aaa626ed8e6d68606fdd9c82bb3d23
+++ packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb 9461f60e0cada163ae639077c522bde341f9c8e7
@@ -1,17 +1,13 @@ INHIBIT_DEFAULT_DEPS = "1"
SECTION = "base"
PACKAGES = ""
LICENSE = "GPL"
INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://nslu.sf.net/downloads/${PN}-${PV}.tar.bz2"
S = "${WORKDIR}/${PN}-${PV}"
-python () {
- # Don't build unless we're targeting an nslu2
- if bb.data.getVar("MACHINE", d, 1) != "nslu2":
- raise bb.parse.SkipPackage("NSLU2 firmware only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
do_compile () {
install -d ${STAGING_LIBDIR}/nslu2-binaries
============================================================
--- packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb b22e258010d05d82f39d87dd924ad3ac9bb25ca8
+++ packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb bf607a99769f09e3ce1f8709db282d711613599d
@@ -1,8 +1,8 @@ PRIORITY = "required"
DESCRIPTION = "Linksys NSLU2 Stock Firmware Libraries."
PACKAGE_ARCH = "nslu2"
SECTION = "base"
PRIORITY = "required"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
@@ -16,8 +16,4 @@ FILES_${PN} = "/lib"
PACKAGES = "${PN}"
FILES_${PN} = "/lib"
+COMPATIBLE_MACHINE = "nslu2"
-python () {
- # Don't build unless we're targeting an nslu2
- if bb.data.getVar("MACHINE", d, 1) != "nslu2":
- raise bb.parse.SkipPackage("NSLU2 stock firmware libraries only builds for the Linksys NSLU2")
-}
============================================================
--- packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb a8d8945c3c8454bbae8b780f83469559f85903cb
+++ packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb 1314757b2bc700225c1c6e759fdb7bd301249f1e
@@ -1,8 +1,8 @@ PRIORITY = "required"
DESCRIPTION = "Linksys NSLU2 Stock Firmware Ramdisk."
PACKAGE_ARCH = "nslu2"
SECTION = "base"
PRIORITY = "required"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
@@ -13,8 +13,4 @@ FILES_${PN} = "/"
PACKAGES = "${PN}"
FILES_${PN} = "/"
+COMPATIBLE_MACHINE = "nslu2"
-python () {
- # Don't build unless we're targeting an nslu2
- if bb.data.getVar("MACHINE", d, 1) != "nslu2":
- raise bb.parse.SkipPackage("NSLU2 ramdisk only builds for the Linksys NSLU2")
-}
============================================================
--- packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb 7ad176f0a7893c493f30362e7026fda2aa706d07
+++ packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb 87419f881d14083e64bf10889a3cc6cfc021559e
@@ -1,8 +1,8 @@ PRIORITY = "required"
DESCRIPTION = "Linksys NSLU2 Stock Firmware Samba Code Pages."
PACKAGE_ARCH = "nslu2"
SECTION = "base"
PRIORITY = "required"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
@@ -22,8 +22,4 @@ FILES_${PN} = "/etc/samba/codepages"
PACKAGES = "${PN}"
FILES_${PN} = "/etc/samba/codepages"
+COMPATIBLE_MACHINE = "nslu2"
-python () {
- # Don't build unless we're targeting an nslu2
- if bb.data.getVar("MACHINE", d, 1) != "nslu2":
- raise bb.parse.SkipPackage("NSLU2 stock firmware Samba code pages only builds for the Linksys NSLU2")
-}
============================================================
--- packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb 3c03dfcaf01eeff3ec571a017cd57e762c514f6b
+++ packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b6544af86d48626e2e00d18ccab20b9c65d04e8f
@@ -1,6 +1,7 @@ SECTION = "base"
SECTION = "base"
+COMPATIBLE_MACHINE = "nslu2"
-PR = "r16"
+PR = "r17"
DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages"
@@ -58,13 +59,6 @@ S = "${WORKDIR}/nslu2-linksys-ramdisk-2.
S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63"
-python () {
- # Don't build unslung images unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- if mach != 'nslu2':
- raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
-
do_compile () {
echo "V2.3R63-uNSLUng-${DISTRO_VERSION}" > ${S}/.unslung
============================================================
--- packages/upslug/upslug-native_1.0.bb 966014b51d826075dab3fb91df188450a156d4e1
+++ packages/upslug/upslug-native_1.0.bb 49670665160cb56efe215e77d2742312621ea10d
@@ -1,11 +1,12 @@
# This package builds the 'upslug' binary upload/flash tool
# for the NSLU2. It is not useful for anything else.
-PR = "r0"
+PR = "r1"
DESCRIPTION = "NSLU2 binary upload tool"
HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "GPL-2"
+COMPATIBLE_MACHINE = "nslu2"
SRC_TAG = "UPSLUG_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
SRC_URI = "cvs://anonymous@nslu.cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug;tag=${SRC_TAG}"
@@ -25,10 +26,3 @@ do_stage() {
do_stage() {
oe_runmake "DESTDIR=${STAGING_BINDIR}" install
}
-
-python () {
- # Don't build upslug unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- if mach != 'nslu2':
- raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2")
-}
============================================================
--- packages/upslug/upslug-native_cvs.bb b49633c12d3814ce737eb05efd23c47d27be8ac8
+++ packages/upslug/upslug-native_cvs.bb 897a73c3262ce63a59ff99c22edf87eb79a17f46
@@ -1,11 +1,12 @@
# This package builds the 'upslug' binary upload/flash tool
# for the NSLU2. It is not useful for anything else.
-PR = "r0"
+PR = "r1"
DESCRIPTION = "NSLU2 binary upload tool"
HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "GPL-2"
+COMPATIBLE_MACHINE = "nslu2"
# Use releases in preference
DEFAULT_PREFERENCE = "-1"
@@ -24,10 +25,3 @@ do_stage() {
do_stage() {
oe_runmake "DESTDIR=${STAGING_BINDIR}" install
}
-
-python () {
- # Don't build upslug unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- if mach != 'nslu2':
- raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2")
-}
More information about the Openembedded-commits
mailing list