From 7cbbbe114bc95b9d67b12849db98dea67d0aaa9e Mon Sep 17 00:00:00 2001 From: "g2@giantshoulder.com" Date: Wed, 23 Mar 2005 23:06:03 +0000 Subject: [PATCH] Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded into giantshoulder.com:/home/tom/dev/openslug/openembedded 2005/03/23 14:41:29-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/23 16:50:15-05:00 accelent.com!cbrake Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gus.accelent.com:/home/cbrake/workspace/oe/openembedded 2005/03/23 16:48:56-05:00 accelent.com!cbrake workaround for do_package bug. do_package is defined as a shell task in base and a python task in other class files. 2005/03/23 13:41:38-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/23 22:15:38+01:00 zeckescompany.nl!alwin cleaned up opie-build 2005/03/23 11:41:49-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/03/23 20:31:47+01:00 zeckescompany.nl!alwin unsupported opie-packages BKrev: 4241f65b1OThHfOIgZxvvL2bOiTMGw --- packages/linux/mainstone-kernel_2.6.11.bb | 44 ++++++++++++++++++ .../linux/vibren-pxa255idp-kernel_2.6.11.bb | 46 +++++++++++++++++++ packages/meta/meta-opie.bb | 1 - packages/opie-showimg/opie-showimg_1.1.9.bb | 23 ---------- packages/opie-showimg/opie-showimg_cvs.bb | 22 --------- 5 files changed, 90 insertions(+), 46 deletions(-) delete mode 100644 packages/opie-showimg/opie-showimg_1.1.9.bb delete mode 100644 packages/opie-showimg/opie-showimg_cvs.bb diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb index e69de29bb2..2a4d168ac0 100644 --- a/packages/linux/mainstone-kernel_2.6.11.bb +++ b/packages/linux/mainstone-kernel_2.6.11.bb @@ -0,0 +1,44 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" +LICENSE = "GPL" +MAINTAINER = "Cliff Brake " +PR = "r1" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ + file://mainstone_defconfig" + +S = "${WORKDIR}/linux-2.6.11" + +COMPATIBLE_HOST = 'arm.*-linux' + +inherit kernel +inherit package + +ARCH = "arm" +KERNEL_IMAGETYPE = "zImage" +#CMDLINE_CONSOLE ?= "ttyS0,115200n8" +#CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000" +#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000" +#CMDLINE_ROOT = "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000" +#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config +# echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config +} + +do_deploy() { + install -d ${DEPLOY_DIR}/images + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + +python () { + # Don't build kernel unless we're targeting a mainstone + mach = bb.data.getVar("MACHINE", d, 1) + if mach != 'mainstone': + raise bb.parse.SkipPackage("This kernel only builds for the Mainstone") +} diff --git a/packages/linux/vibren-pxa255idp-kernel_2.6.11.bb b/packages/linux/vibren-pxa255idp-kernel_2.6.11.bb index e69de29bb2..aff62e9d67 100644 --- a/packages/linux/vibren-pxa255idp-kernel_2.6.11.bb +++ b/packages/linux/vibren-pxa255idp-kernel_2.6.11.bb @@ -0,0 +1,46 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for the Vibren PXA255 IDP" +LICENSE = "GPL" +MAINTAINER = "Cliff Brake " +PR = "r2" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ + ftp://bec-systems.com/pub/pxa255_idp/linux/kernel-2.6.11-rc4_idp.patch;patch=1 \ + ftp://bec-systems.com/pub/pxa255_idp/linux/kernel-2.6.11_idp_leds.patch;patch=1 \ + file://vibren-pxa255idp_defconfig" + +S = "${WORKDIR}/linux-2.6.11" + +COMPATIBLE_HOST = 'arm.*-linux' + +inherit kernel +inherit package + +ARCH = "arm" +KERNEL_IMAGETYPE = "uImage" +#CMDLINE_CONSOLE ?= "ttyS0,115200n8" +#CMDLINE_ROOT = "root=/dev/slug rootfstype=ext2,jffs2 initrd=0x01000000,10M mem=32M@0x00000000" +#CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 mem=32M@0x00000000" +#CMDLINE_ROOT = "root=/dev/ram0 rw rootfstype=ext2,jffs2 initrd=0x01000000,10M init=/linuxrc mem=32M@0x00000000" +#CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config +# echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config +} + +do_deploy() { + install -d ${DEPLOY_DIR}/images + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + +python () { + # Don't build openslug kernel unless we're targeting an nslu2 + mach = bb.data.getVar("MACHINE", d, 1) + if mach != 'vibren-pxa255idp': + raise bb.parse.SkipPackage("This kernel only builds for the Vibren PXA255 IDP") +} diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb index 0cb9379d69..8b736fc902 100644 --- a/packages/meta/meta-opie.bb +++ b/packages/meta/meta-opie.bb @@ -95,7 +95,6 @@ opie-rdesktop \ opie-reader \ opie-remote \ opie-sheet \ -opie-showimg \ opie-tableviewer \ opie-tinykate \ opie-wellenreiter \ diff --git a/packages/opie-showimg/opie-showimg_1.1.9.bb b/packages/opie-showimg/opie-showimg_1.1.9.bb deleted file mode 100644 index f03250d76c..0000000000 --- a/packages/opie-showimg/opie-showimg_1.1.9.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Simple Image Viewer" -SECTION = "opie/applications" -PRIORITY = "optional" -MAINTAINER = "Team Opie " -LICENSE = "GPL" - -APPNAME = "showimg" - - -SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/showimg \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" - -S = "${WORKDIR}/${APPNAME}" - -inherit opie - -# FILES plugins/application/libshowimg.so* bin/showimg apps/Applications/showimg.desktop pics/imageviewer -do_install() { - install -d ${D}${palmtopdir}/pics/imageviewer/ - install -m 0644 ${WORKDIR}/pics/imageviewer/*.png ${D}${palmtopdir}/pics/imageviewer/ -} - diff --git a/packages/opie-showimg/opie-showimg_cvs.bb b/packages/opie-showimg/opie-showimg_cvs.bb deleted file mode 100644 index ff1398ff3f..0000000000 --- a/packages/opie-showimg/opie-showimg_cvs.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Simple Image Viewer" -SECTION = "opie/applications" -PRIORITY = "optional" -MAINTAINER = "Team Opie " -LICENSE = "GPL" -PV = "1.1.9+cvs-${CVSDATE}" -APPNAME = "showimg" - -SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/showimg \ - ${HANDHELDS_CVS};module=opie/pics \ - ${HANDHELDS_CVS};module=opie/apps" - -S = "${WORKDIR}/${APPNAME}" - -inherit opie - -# FILES plugins/application/libshowimg.so* bin/showimg apps/Applications/showimg.desktop pics/imageviewer -do_install() { - install -d ${D}${palmtopdir}/pics/imageviewer/ - install -m 0644 ${WORKDIR}/pics/imageviewer/*.png ${D}${palmtopdir}/pics/imageviewer/ -} - -- 2.39.5