diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/arm-kernel-shim/arm-kernel-shim_1.3.bb (renamed from packages/arm-kernel-shim/arm-kernel-shim_1.2.bb) | 19 | ||||
| -rw-r--r-- | packages/arm-kernel-shim/files/disable-commandline.patch | 28 | ||||
| -rw-r--r-- | packages/arm-kernel-shim/files/place-boot-section.patch | 12 | ||||
| -rw-r--r-- | packages/images/openprotium-image.bb | 2 | ||||
| -rw-r--r-- | packages/images/slugos-image.bb | 76 | ||||
| -rw-r--r-- | packages/images/slugos-imagename.bb | 29 | ||||
| -rw-r--r-- | packages/meta/slugos-native-packages.bb | 1 | ||||
| -rw-r--r-- | packages/meta/slugos-native.bb | 2 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-slugos.bb | 51 |
10 files changed, 70 insertions, 152 deletions
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb index aa7c7cd64c..ac9df9579b 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb @@ -8,13 +8,12 @@ PR = "r1" COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \ - file://place-boot-section.patch;patch=1 \ file://config-nslu2.h \ file://config-nas100d.h \ file://config-dsmg600.h \ file://config-fsg3.h" -S = ${WORKDIR}/arm-kernel-shim-${PV} +S = ${WORKDIR}/arm-kernel-shim-${PV}/${PV} EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" @@ -23,23 +22,23 @@ oe_runmake() { # NSLU2 cp ${WORKDIR}/config-nslu2.h ${S}/config.h rm -f ${S}/main.o - oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 - make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed" + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed" # NAS100d cp ${WORKDIR}/config-nas100d.h ${S}/config.h rm -f ${S}/main.o - oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d - make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed" + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed" # DSMG-600 cp ${WORKDIR}/config-dsmg600.h ${S}/config.h rm -f ${S}/main.o - oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 - make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed" + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed" # FSG-3 cp ${WORKDIR}/config-fsg3.h ${S}/config.h rm -f ${S}/main.o - oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 - make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed" + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 + make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed" mv ${S}/config.h.orig ${S}/config.h } diff --git a/packages/arm-kernel-shim/files/disable-commandline.patch b/packages/arm-kernel-shim/files/disable-commandline.patch deleted file mode 100644 index d8c59f1a6b..0000000000 --- a/packages/arm-kernel-shim/files/disable-commandline.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- arm-kernel-shim/main.c~ 2006-07-21 11:12:07.000000000 +0930 -+++ arm-kernel-shim/main.c 2007-01-28 11:56:35.000000000 +1030 -@@ -47,7 +47,9 @@ - - #define NAKED __attribute__((naked)) - -+#if defined (COMMANDLINE) - const char __attribute__((section(".rodata"))) cmdline[] = COMMANDLINE; -+#endif - - void NAKED __attribute__((section(".boot"))) boot (u32 r0, u32 r1, u32 r2) - { -@@ -82,6 +84,7 @@ - pv += H_SIZE(pv)*4; - #endif - -+#if defined (COMMANDLINE) - /* Command line */ - H_SIZE(pv) = tag_size(tag_cmdline) + (sizeof (cmdline)+1+3)/4; - H_TAG(pv) = ATAG_CMDLINE; -@@ -91,6 +94,7 @@ - P_CMDLINE(pv)->cmdline[i] = cmdline[i]; - } - pv += H_SIZE(pv)*4; -+#endif - - /* End */ - H_SIZE(pv) = 0; diff --git a/packages/arm-kernel-shim/files/place-boot-section.patch b/packages/arm-kernel-shim/files/place-boot-section.patch deleted file mode 100644 index 6e6c9460a5..0000000000 --- a/packages/arm-kernel-shim/files/place-boot-section.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- arm-kernel-shim-1.2/Makefile~ 2007-02-06 16:44:31.000000000 +1030 -+++ arm-kernel-shim-1.2/Makefile 2007-02-06 16:56:12.000000000 +1030 -@@ -9,7 +9,8 @@ - OBJCOPY=$(TOOLS)objcopy - - CFLAGS:=-g -Os -nostartfiles -nostdlib --LDFLAGS:= -g -X -Map shim.map -Ttext 0 -+# LDFLAGS:= -g -X -Map shim.map -Ttext 0 -+LDFLAGS:= -g -X -Map shim.map -Ttext 0 --section-start .boot=1fb - - SRCS:= shim.lds main.c - OBJS:=$(SRCS:.c=.o) diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb index faec2664ca..472000f4f0 100644 --- a/packages/images/openprotium-image.bb +++ b/packages/images/openprotium-image.bb @@ -4,8 +4,6 @@ LICENSE = "MIT" PR = "r0" DEPENDS = "${MACHINE_TASK_PROVIDER}" -# SLUGOS_IMAGENAME defines the name of the image to be build, if it -# is not set this package will be skipped! EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x10000 -D ${SLUGOS_DEVICE_TABLE}" IMAGE_LINGUAS = "" diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 3a3e5f49a8..1ca30f9d9d 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -6,13 +6,11 @@ DESCRIPTION = "Generic SlugOS image" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r44" +PR = "r45" +PROVIDES += "${SLUGOS_DISTRO}-image" COMPATIBLE_MACHINE = "nslu2" -# SLUGOS_IMAGENAME defines the name of the image to be build, if it -# is not set this package will be skipped! -IMAGE_BASENAME = "${SLUGOS_IMAGENAME}" IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}" IMAGE_FSTYPES = "jffs2" EXTRA_IMAGECMD_jffs2 += " -D ${SLUGOS_DEVICE_TABLE}" @@ -34,86 +32,29 @@ SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;" IMAGE_PREPROCESS_COMMAND += "install -c -m 644 ${SLUGOS_DEVICE_TABLE} ${IMAGE_ROOTFS}/etc/device_table;" -# Building a full image. If required do a post-process command which builds -# the full flash image using slugimage. At present this only works for NSLU2 images. -PACK_IMAGE = "" -IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}" -PACK_IMAGE_DEPENDS = "" -EXTRA_IMAGEDEPENDS += "${PACK_IMAGE_DEPENDS}" - # This hack removes '${MACHINE}' from the end of the arch.conf for ipk, # preventing _mach.ipk (with no byte sex) taking precedence over everything # else. ROOTFS_POSTPROCESS_COMMAND += "sed -i '$d' '${IMAGE_ROOTFS}/etc/ipkg/arch.conf';" -# These depends define native utilities - they do not get put in the flash and -# are not required to build the image. -IMAGE_TOOLS = "" -EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}" - -# CONFIG: -# SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image -# SLUGOS_SUPPORT: set here, see below, added to the image. -# SLUGOS_KERNEL: set here, kernel modules added to the image -# -# Do not override the last two unless you really know what you -# are doing - there is more information below. - -# diff, cpio and find are required for reflash and turnup ram. -# Removing these probably leaves the system bootable, but standard -# openslug and ucslugc stuff won't work, so only take these out in -# very non-standard turnkey slugos builds. -# -# udev is the default way of handling devices, there is no guarantee -# that the static device table is completely correct (it is just -# known to be sufficient for boot.) -SLUGOS_SUPPORT ?= "diffutils cpio findutils udev" - -SLUGOS_KERNEL ?= "" +SLUGOS_EXTRA_INSTALL ?= "" -SLUGOS_EXTRA_RDEPENDS ?= "" - -RDEPENDS = "kernel ixp4xx-npe \ - base-files base-passwd netbase \ - busybox initscripts-slugos slugos-init \ - update-modules sysvinit tinylogin \ - module-init-tools modutils-initscripts \ - ipkg-collateral ipkg ipkg-link \ - portmap \ - dropbear \ - beep \ - e2fsprogs-blkid \ - util-linux-mount \ - util-linux-umount \ - util-linux-swaponoff \ - util-linux-losetup \ - ${SLUGOS_SUPPORT} \ - ${SLUGOS_KERNEL} \ - ${SLUGOS_EXTRA_RDEPENDS}" +DEPENDS = "task-slugos" +RDEPENDS = "task-slugos ${SLUGOS_EXTRA_INSTALL}" PACKAGE_INSTALL = "${RDEPENDS}" inherit image -python () { - # Don't build slugos images unless the configuration is set up - # for an image build! - if bb.data.getVar("SLUGOS_IMAGENAME", d, 1) == '': - raise bb.parse.SkipPackage("absent or broken SlugOS configuration") -} - -#-------------------------------------------------------------------------------- -# NSLU2 specific -# #NOTE: you do not actually need the boot loader in normal use because it is # *not* overwritten by a standard upslug upgrade, so you can make an image with # just non-LinkSys software which can be flashed into the NSLU2. Because # LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot) # it is a bad idea to produce flash images without a valid RedBoot - that allows # an innocent user upgrade attempt to instantly brick the NSLU2. -PACK_IMAGE += "${@['', 'slugos_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" -PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" +IMAGE_POSTPROCESS_COMMAND += "slugos_pack_image;" +EXTRA_IMAGEDEPENDS += "slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native" NSLU2_SLUGIMAGE_ARGS ?= "" slugos_pack_image() { @@ -168,6 +109,3 @@ slugos_pack_image() { -C ${DEPLOY_DIR_IMAGE} firmupgrade rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade } - -# upslug2 (in tmp/work/upslug2-native-*) is the program to write the NSLU2 flash -IMAGE_TOOLS_nslu2 = "upslug2-native" diff --git a/packages/images/slugos-imagename.bb b/packages/images/slugos-imagename.bb deleted file mode 100644 index 61629d44af..0000000000 --- a/packages/images/slugos-imagename.bb +++ /dev/null @@ -1,29 +0,0 @@ -# This is an inglorious hack to provide a package to match -# ${SLUGOS_IMAGENAME}-image -LICENSE = "MIT" -PN = "${SLUGOS_IMAGENAME}-image" -PV = "0" -PR = "r0" -DEPENDS = "slugos-image" -PACKAGES = "" -INHIBIT_DEFAULT_DEPS = "1" - -SLUGOS_IMAGENAME ?= "slugos" -COMPATIBLE_MACHINE = "nslu2" - -do_fetch() { -} -do_unpack() { -} -do_patch() { -} -do_configure() { -} -do_compile() { -} -do_install() { -} -do_stage() { -} -do_build() { -} diff --git a/packages/meta/slugos-native-packages.bb b/packages/meta/slugos-native-packages.bb index 4505c9979c..db2ab46a3c 100644 --- a/packages/meta/slugos-native-packages.bb +++ b/packages/meta/slugos-native-packages.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Packages that are to be compiled natively for the SlugOS firmware" LICENSE = "MIT" PR = "r1" +PROVIDES += "${SLUGOS_DISTRO}-native-packages" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index d8e8ee96bb..9a4e17d56a 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -11,7 +11,7 @@ INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" ALLOW_EMPTY = "1" PACKAGES = "${PN}" -PROVIDES += "${SLUGOS_IMAGENAME}-native" +PROVIDES += "${SLUGOS_DISTRO}-native" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 01a79a8e75..507600df32 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" PR = "r17" CONFLICTS = "db3" -PROVIDES += "${SLUGOS_IMAGENAME}-packages" +PROVIDES += "${SLUGOS_DISTRO}-packages" COMPATIBLE_MACHINE = "nslu2" EXCLUDE_FROM_WORLD = "1" diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb new file mode 100644 index 0000000000..c25dcd973f --- /dev/null +++ b/packages/tasks/task-slugos.bb @@ -0,0 +1,51 @@ +# This describes a generic SlugOS image, even though the bb file is +# called 'slugos-image.bb' the distro specific configuration is +# done in conf/distro/${DISTRO}.conf (which should always include +# conf/distro/slugos.conf to get the standard settings). +# +DESCRIPTION = "Task packages for the SlugOS distribution" +HOMEPAGE = "http://www.nslu2-linux.org" +LICENSE = "MIT" +PR = "r2" +PACKAGE_ARCH = "${MACHINE_ARCH}" +ALLOW_EMPTY = "1" + +# CONFIG: +# SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image +# SLUGOS_SUPPORT: set here, see below, added to the image. +# SLUGOS_KERNEL: set here, kernel modules added to the image +# +# Do not override the last two unless you really know what you +# are doing - there is more information below. + +# diff, cpio and find are required for reflash and turnup ram. +# Removing these probably leaves the system bootable, but standard +# openslug and ucslugc stuff won't work, so only take these out in +# very non-standard turnkey slugos builds. +# +# udev is the default way of handling devices, there is no guarantee +# that the static device table is completely correct (it is just +# known to be sufficient for boot.) +SLUGOS_SUPPORT ?= "diffutils cpio findutils udev" + +SLUGOS_KERNEL ?= "" + +SLUGOS_EXTRA_RDEPENDS ?= "" + +RDEPENDS = "kernel ixp4xx-npe \ + base-files base-passwd netbase \ + busybox initscripts-slugos slugos-init \ + update-modules sysvinit tinylogin \ + module-init-tools modutils-initscripts \ + ipkg-collateral ipkg ipkg-link \ + portmap \ + dropbear \ + beep \ + e2fsprogs-blkid \ + util-linux-mount \ + util-linux-umount \ + util-linux-swaponoff \ + util-linux-losetup \ + ${SLUGOS_SUPPORT} \ + ${SLUGOS_KERNEL} \ + ${SLUGOS_EXTRA_RDEPENDS}" |