diff options
41 files changed, 244 insertions, 87 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index a06c1c1905..1728b65709 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -723,7 +723,14 @@ python __anonymous () { this_host = bb.data.getVar('HOST_SYS', d, 1) if not re.match(need_host, this_host): raise bb.parse.SkipPackage("incompatible with host %s" % this_host) - + + need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1) + if need_machine: + import re + this_machine = bb.data.getVar('MACHINE', d, 1) + if not re.match(need_machine, this_machine): + raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine) + pn = bb.data.getVar('PN', d, 1) srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 7a147d8cf1..599d787898 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -36,7 +36,7 @@ INHERIT += " package_ipk nslu2-jffs2-image" IMAGE_FSTYPE = "jffs2" UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}" -EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}" +EXTRA_IMAGECMD_jffs2 = "--no-eraseblock-headers --pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}" UNSLUNG_EXTRA_DEPENDS ?= "" UNSLUNG_EXTRA_RDEPENDS ?= "" diff --git a/conf/documentation.conf b/conf/documentation.conf index d85ccdb0db..20bcc53f5f 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -96,3 +96,6 @@ SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the # palmtop build class PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread" + +COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names supported by the package/file. Failure to match will cause the file to be skipped by the parser." +COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser."
\ No newline at end of file diff --git a/packages/binutils/binutils_2.15.94.0.1.bb b/packages/binutils/binutils_2.15.94.0.1.bb index 6d4a1dee69..2b2996abe6 100644 --- a/packages/binutils/binutils_2.15.94.0.1.bb +++ b/packages/binutils/binutils_2.15.94.0.1.bb @@ -42,6 +42,7 @@ SRC_URI = \ file://ld_makefile.patch;patch=1 \ file://better_file_error.patch;patch=1 \ file://signed_char_fix.patch;patch=1 \ + file://objdump_fix.patch;patch=1 \ file://binutils-100_cflags_for_build.patch;patch=1 \ file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \ file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1" diff --git a/packages/binutils/files/objdump_fix.patch b/packages/binutils/files/objdump_fix.patch new file mode 100644 index 0000000000..90ad732c06 --- /dev/null +++ b/packages/binutils/files/objdump_fix.patch @@ -0,0 +1,134 @@ +From binutils-return-38148-listarch-binutils=sources dot redhat dot com at sources dot redhat dot com Tue Feb 22 19:24:15 2005 +Return-Path: <binutils-return-38148-listarch-binutils=sources dot redhat dot com at sources dot redhat dot com> +Delivered-To: listarch-binutils at sources dot redhat dot com +Received: (qmail 4446 invoked by alias); 22 Feb 2005 19:24:15 -0000 +Mailing-List: contact binutils-help at sources dot redhat dot com; run by ezmlm +Precedence: bulk +List-Subscribe: <mailto:binutils-subscribe at sources dot redhat dot com> +List-Archive: <http://sources.redhat.com/ml/binutils/> +List-Post: <mailto:binutils at sources dot redhat dot com> +List-Help: <mailto:binutils-help at sources dot redhat dot com>, <http://sources dot redhat dot com/ml/#faqs> +Sender: binutils-owner at sources dot redhat dot com +Delivered-To: mailing list binutils at sources dot redhat dot com +Received: (qmail 4401 invoked from network); 22 Feb 2005 19:24:08 -0000 +Received: from unknown (HELO bgo1smout1.broadpark.no) (217.13.4.94) + by sourceware dot org with SMTP; 22 Feb 2005 19:24:08 -0000 +Received: from bgo1sminn1.broadpark.no ([217.13.4.93]) + by bgo1smout1 dot broadpark dot no + (Sun Java System Messaging Server 6 dot 1 HotFix 0 dot 05 (built Oct 21 2004)) + with ESMTP id <0ICB007QZUZCC0C0 at bgo1smout1 dot broadpark dot no> for + binutils at sources dot redhat dot com; Tue, 22 Feb 2005 20:18:48 +0100 (CET) +Received: from [127.0.0.1] ([80.202.165.9]) by bgo1sminn1.broadpark.no + (Sun Java System Messaging Server 6 dot 1 HotFix 0 dot 05 (built Oct 21 2004)) + with ESMTP id <0ICB006NCVBVHE21 at bgo1sminn1 dot broadpark dot no> for + binutils at sources dot redhat dot com; Tue, 22 Feb 2005 20:26:20 +0100 (CET) +Date: Tue, 22 Feb 2005 20:24:08 +0100 +From: =?ISO-8859-1?Q?Stig_Petter_Olsr=F8d?= <stigpo at users dot sourceforge dot net> +Subject: [PATCH] objdump relocation fixes for ARM disassembly +To: binutils at sources dot redhat dot com +Message-id: <421B86D8.8080604@users.sourceforge.net> +MIME-version: 1.0 +Content-type: text/plain; charset=ISO-8859-1; format=flowed +Content-transfer-encoding: 7BIT +User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) + +Hello, + +objdump disassembly did not relocate correctly for the ARM processor. It seems +that the test for triggering the INSN_HAS_RELOC flag was void (one test killed the other, +since octets would always be zero) and all relocations would thus fail. I changed the test +so the flag is set when we are about to disassemble an insn that the current relocation +entry points to. I also changed objdump_print_addr to use the current relocation entry if +the insn has such an entry. This causes the symbol printed to be correct for both external +symbols (from the undefined section) and local symbols. + +This has only been tested for the ARM processor, but I don't think it should break other +DISASSEMBLER_NEEDS_RELOCS processors either. + + +binutils/ + +2005-02-22 Stig Petter Olsroed <stigpo@users.sourceforge.net> + + * objdump.c (disassemble_bytes): Fixed relocation check for + DISASSEMBLER_NEEDS_RELOCS platforms to properly trigger the + INSN_HAS_RELOC flag. Set the current relocation entry in + objdump_disasm_info to allow printing the proper symbol. + (objdump_print_addr): Use the relocation entry in + objdump_disasm_info to lookup the correct symbol for + DISASSEMBLER_NEEDS_RELOCS platforms. + +--- 1/binutils/objdump.c 2005-02-22 01:50:06.000000000 +0100 ++++ 2/binutils/objdump.c 2005-02-22 14:27:33.066960900 +0100 +@@ -128,6 +128,7 @@ + arelent ** dynrelbuf; + long dynrelcount; + disassembler_ftype disassemble_fn; ++ arelent * reloc; + }; + + /* Architecture to disassemble for, or default if NULL. */ +@@ -852,6 +853,8 @@ + { + struct objdump_disasm_info *aux; + asymbol *sym; ++ arelent *q; ++ int skip_find = 0; + + if (sorted_symcount < 1) + { +@@ -861,6 +864,22 @@ + } + + aux = (struct objdump_disasm_info *) info->application_data; ++ ++ q = aux->reloc; ++ if (q != NULL) ++ { ++ if (q->sym_ptr_ptr != NULL && *q->sym_ptr_ptr != NULL) ++ { ++ /* Adjust the vma to the reloc */ ++ vma += bfd_asymbol_value (*q->sym_ptr_ptr); ++ if (bfd_is_und_section (bfd_get_section (*q->sym_ptr_ptr))) ++ { ++ skip_find = 1; ++ sym = *q->sym_ptr_ptr; ++ } ++ } ++ } ++ if (!skip_find) + sym = find_symbol_for_address (vma, info, NULL); + objdump_print_addr_with_sym (aux->abfd, aux->sec, sym, vma, info, + skip_zeroes); +@@ -1350,16 +1369,22 @@ + info->bytes_per_chunk = 0; + + #ifdef DISASSEMBLER_NEEDS_RELOCS +- /* FIXME: This is wrong. It tests the number of octets +- in the last instruction, not the current one. */ +- if (*relppp < relppend +- && (**relppp)->address >= rel_offset + addr_offset +- && ((**relppp)->address +- < rel_offset + addr_offset + octets / opb)) ++ /* Check if the current relocation entry applies to the ++ instruction we are about to disassemble. ++ This works for ARM at least. ++ */ ++ if ((*relppp) < relppend ++ && ((**relppp)->address == rel_offset + addr_offset)) ++ { + info->flags = INSN_HAS_RELOC; ++ aux->reloc = **relppp; ++ } + else + #endif ++ { + info->flags = 0; ++ aux->reloc = NULL; ++ } + + octets = (*disassemble_fn) (section->vma + addr_offset, info); + info->fprintf_func = (fprintf_ftype) fprintf; + + + diff --git a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb index 0b8b6ab63a..5df470af1d 100644 --- a/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb +++ b/packages/linux/devkitidp-pxa255-kernel_2.6.11.bb @@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2 \ S = "${WORKDIR}/linux-2.6.11" COMPATIBLE_HOST = 'arm.*-linux' +COMPATIBLE_MACHINE = "devkitidp-pxa255" inherit kernel inherit package @@ -38,10 +39,3 @@ do_deploy() { do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile - -python () { - # Don't build kernel unless we're targeting an nslu2 - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'devkitidp-pxa255': - raise bb.parse.SkipPackage("This kernel only builds for the PXA255 DevKitIDP") -} diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb index c0b3bf2742..846e5f4fa2 100644 --- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb +++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb @@ -21,9 +21,4 @@ do_configure_prepend() { oe_runmake oldconfig } -python __anonymous () { - import re - host = bb.data.getVar('HOST_SYS', d, 1) - if not re.match('arm.*-linux', host): - raise bb.parse.SkipPackage("incompatible with host %s" % host) -} +COMPATIBLE_HOST = 'arm.*-linux' diff --git a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb index 5cb4a439b1..feb9581e5c 100644 --- a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb +++ b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb @@ -10,12 +10,7 @@ S = "${WORKDIR}/linux-2.6.9" inherit kernel -python __anonymous () { - import re - host = bb.data.getVar('HOST_SYS', d, 1) - if not re.match('arm.*-linux', host): - raise bb.parse.SkipPackage("incompatible with host %s" % host) -} +COMPATIBLE_HOST = 'arm.*-linux' KERNEL_IMAGETYPE = "uImage" diff --git a/packages/linux/linux-omap1_2.6.12-rc2.bb b/packages/linux/linux-omap1_2.6.12-rc2.bb index 133fe9ac2c..7ea9e16091 100644 --- a/packages/linux/linux-omap1_2.6.12-rc2.bb +++ b/packages/linux/linux-omap1_2.6.12-rc2.bb @@ -18,13 +18,7 @@ KERNEL_CCSUFFIX = "-3.3.4" inherit kernel -python __anonymous () { - import re - host = bb.data.getVar('HOST_SYS', d, 1) - if not re.match('arm.*-linux', host): - raise bb.parse.SkipPackage("incompatible with host %s" % host) -} - +COMPATIBLE_HOST = 'arm.*-linux' do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-akita b/packages/linux/linux-openzaurus-2.6.16/defconfig-akita index 7b9e57436e..3dbe1bdfca 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-akita +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-akita @@ -739,7 +739,7 @@ CONFIG_INPUT=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_MOUSEDEV=m # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 index 80722f4081..cb18588d42 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 @@ -752,7 +752,7 @@ CONFIG_INPUT=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_MOUSEDEV=m # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie b/packages/linux/linux-openzaurus-2.6.16/defconfig-collie index 0ed5efa9b9..1400c2ea69 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-collie @@ -587,7 +587,7 @@ CONFIG_INPUT=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_MOUSEDEV=m # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_TSDEV=y CONFIG_INPUT_TSDEV_SCREEN_X=240 diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270 b/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270 index 9f029a7467..a2850c16a6 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270 +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270 @@ -576,7 +576,7 @@ CONFIG_INPUT=y # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_MOUSEDEV=m # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle index 43cbba6f41..b2612995b2 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle @@ -761,7 +761,7 @@ CONFIG_INPUT=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_MOUSEDEV=m # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz index 058d7a9ab1..716fca0c05 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz @@ -739,7 +739,7 @@ CONFIG_INPUT=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_MOUSEDEV=m # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa index 96fc41cdbd..32637044e8 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa @@ -752,7 +752,7 @@ CONFIG_INPUT=y # # Userland interfaces # -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_MOUSEDEV=m # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index eabdc28220..45a4652862 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -21,6 +21,7 @@ ALLOW_EMPTY = 1 EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|ipaq-pxa270|qemuarm)' CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb index 8e49ffa2c2..32361b7810 100644 --- a/packages/linux/linux-wrt_2.4.20.bb +++ b/packages/linux/linux-wrt_2.4.20.bb @@ -58,9 +58,4 @@ do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile -python () { - # Don't build kernel unless we're targeting a wrt - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'wrt54': - raise bb.parse.SkipPackage("Unable to build for non-WRT54 device.") -} +COMPATIBLE_MACHINE = "wrt54" diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb index 0d9229c5d8..352c879d45 100644 --- a/packages/linux/linux-wrt_2.4.30.bb +++ b/packages/linux/linux-wrt_2.4.30.bb @@ -112,9 +112,4 @@ do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile -python () { - # Don't build kernel unless we're targeting a wrt - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'wrt54': - raise bb.parse.SkipPackage("Unable to build for non-WRT54 device.") -} +COMPATIBLE_MACHINE = "wrt54" diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb index 12422c96de..0e242c2dc8 100644 --- a/packages/linux/mainstone-kernel_2.6.11.bb +++ b/packages/linux/mainstone-kernel_2.6.11.bb @@ -36,9 +36,4 @@ 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") -} +COMPATIBLE_MACHINE = "mainstone" diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc index b4c675264a..bfae5f82d4 100644 --- a/packages/linux/nslu2-kernel.inc +++ b/packages/linux/nslu2-kernel.inc @@ -257,9 +257,4 @@ do_deploy() { addtask deploy before do_build after do_compile -python () { - # Don't build the kernel unless we're targeting an nslu2 - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'nslu2': - raise bb.parse.SkipPackage("nslu2-kernel only builds for the Linksys NSLU2") -} +COMPATIBLE_MACHINE = "nslu2" diff --git a/packages/linux/nslu2-linksys-kernel_2.4.22.bb b/packages/linux/nslu2-linksys-kernel_2.4.22.bb index 40bceb373e..de2715d107 100644 --- a/packages/linux/nslu2-linksys-kernel_2.4.22.bb +++ b/packages/linux/nslu2-linksys-kernel_2.4.22.bb @@ -17,13 +17,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.22.tar.bz2 \ file://defconfig" S = "${WORKDIR}/linux-2.4.22" -python () { - # Don't build unless we're targeting an nslu2 - if bb.data.getVar("MACHINE", d, 1) != "nslu2": - raise bb.parse.SkipPackage("NSLU2 kernel only builds for the Linksys NSLU2") -} - COMPATIBLE_HOST = 'arm.*-linux' +COMPATIBLE_MACHINE = "nslu2" inherit kernel diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb index d9addd968a..eae524a7ae 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb @@ -75,6 +75,7 @@ EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}" KERNEL_CCSUFFIX = "-2.95" KERNEL_LDSUFFIX = "-2.11.2" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(akita|spitz|borzoi)' PARALLEL_MAKE = "" # diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index 4c8b43121d..3b0024d147 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -89,6 +89,7 @@ EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}" KERNEL_CCSUFFIX = "-2.95" KERNEL_LDSUFFIX = "-2.11.2" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(c7x0|corgi|husky|shepherd|poodle|poodle255)' PARALLEL_MAKE = "" # diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb index f600acbaed..a79d4f3a00 100644 --- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb +++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb @@ -57,6 +57,7 @@ ALLOW_EMPTY = 1 KERNEL_CCSUFFIX = "-2.95" KERNEL_LDSUFFIX = "-2.11.2" COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = "collie" EXTRA_OEMAKE = " EMBEDIXRELEASE=-${DISTRO_VERSION}" module_conf_usbdmonitor = "alias usbd0 usbdmonitor" diff --git a/packages/linux/poodle-kernels-2.4-embedix.bb b/packages/linux/poodle-kernels-2.4-embedix.bb index e21a47a908..7a714b7a12 100644 --- a/packages/linux/poodle-kernels-2.4-embedix.bb +++ b/packages/linux/poodle-kernels-2.4-embedix.bb @@ -1 +1,2 @@ +COMPATIBLE_MACHINE = "poodle" DEPENDS = "poodle-kernel-2.4-embedix poodle255-kernel-2.4-embedix" diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb index 6fc575c2b0..e42dfa2ae9 100644 --- a/packages/linux/triton-kernel_2.6.11.bb +++ b/packages/linux/triton-kernel_2.6.11.bb @@ -37,9 +37,4 @@ do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile -python () { - # Don't build kernel unless we're targeting an triton - mach = bb.data.getVar("MACHINE", d, 1) - if mach != 'triton': - raise bb.parse.SkipPackage("The triton kernel is only for use on triton machines") -} +COMPATIBLE_MACHINE = "triton" diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 8aa07e8978..c397a90efe 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -28,9 +28,4 @@ SRC_URI += "file://linux-kernel-R25_to_R29.patch;patch=1 \ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -python () { - # Don't build unslung kernel 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") -} +COMPATIBLE_MACHINE = "nslu2" diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES index e8b0255a9b..695be929c4 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/NOTES +++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES @@ -517,3 +517,8 @@ Fixed ppp-mppe.c to remove unresolved symbols when loading module. Disable the ourtelnetrescueuser account in the passwd file entirely since Unslung doesn't need it anymore. + +Include losetup with slingbox (so we have losetup in the firmware). + +Fix extraneous boot messages from jffs2 filesystem driver (change options +used when building the flash jffs image). diff --git a/packages/rott/files/.mtn2git_empty b/packages/rott/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/rott/files/.mtn2git_empty diff --git a/packages/rott/files/gcc4.patch b/packages/rott/files/gcc4.patch new file mode 100644 index 0000000000..6a850533c7 --- /dev/null +++ b/packages/rott/files/gcc4.patch @@ -0,0 +1,39 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- rott-1.0/rott/rt_actor.c~gcc4 ++++ rott-1.0/rott/rt_actor.c +@@ -430,11 +430,11 @@ + void AvoidPlayerMissile(objtype*ob); + int EnvironmentDamage(objtype *ob); + +-static int STOPSPEED = 0x200; +-static int PLAYERFRICTION = 0xe000; +-static int ACTORFRICTION = 0xf000; +-static int DIAGADJUST = 0xb504; +-static boolean MissileSound = true; ++int STOPSPEED = 0x200; ++int PLAYERFRICTION = 0xe000; ++int ACTORFRICTION = 0xf000; ++int DIAGADJUST = 0xb504; ++boolean MissileSound = true; + + + +--- rott-1.0/rott/rt_in.c~gcc4 ++++ rott-1.0/rott/rt_in.c +@@ -155,9 +155,9 @@ + // + //****************************************************************************] + +-static KeyboardDef KbdDefs = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51}; +-static JoystickDef JoyDefs[MaxJoys]; +-static ControlType Controls[MAXPLAYERS]; ++KeyboardDef KbdDefs = {0x1d,0x38,0x47,0x48,0x49,0x4b,0x4d,0x4f,0x50,0x51}; ++JoystickDef JoyDefs[MaxJoys]; ++ControlType Controls[MAXPLAYERS]; + + + static boolean IN_Started; diff --git a/packages/rott/files/rott.jpg b/packages/rott/files/rott.jpg Binary files differnew file mode 100644 index 0000000000..e0d2807c39 --- /dev/null +++ b/packages/rott/files/rott.jpg diff --git a/packages/rott/rott_1.0.bb b/packages/rott/rott_1.0.bb index 821e6ad962..5453001ed0 100644 --- a/packages/rott/rott_1.0.bb +++ b/packages/rott/rott_1.0.bb @@ -1,22 +1,22 @@ DESCRIPTION = "Rise of the Triad - an SDL based Doom clone - QtE based Palmtop Environments Edition" -SECTION = "opie/games" -PRIORITY = "optional" +HOMEPAGE = "http://www.icculus.org/root" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -DEPENDS = "virtual/libqpe libsdl-qpe libsdl-image libsdl-mixer" -PR = "r1" +PR = "r2" -SRC_URI = "http://icculus.org/rott/releases/rott-${PV}.tar.gz" +APPIMAGE = "${WORKDIR}/rott.jpg" + +SRC_URI = "http://icculus.org/rott/releases/rott-${PV}.tar.gz \ + file://gcc4.patch;patch=1;pnum=2 \ + file://rott.jpg" S = "${WORKDIR}/rott-${PV}/rott" CFLAGS += "-DPLATFORM_UNIX" EXTRA_OEMAKE = 'SDL_INC_DIR=${STAGING_INCDIR}/SDL CC="${CC}" EXTRALDFLAGS="${LDFLAGS}"' -# FIXME: Add Opie integration, i.e. a .desktop file and a logo +inherit sdl do_install() { - install -d ${D}${palmtopdir}/bin/ - install -m 0755 rott ${D}${palmtopdir}/bin/ + install -d ${D}${bindir} + install -m 0755 rott ${D}${bindir} } - -FILES_${PN} = "${palmtopdir}" diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb index beb00d5f9d..f7a04cf6f2 100644 --- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb +++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb @@ -13,6 +13,7 @@ S = "${WORKDIR}/AtiCore-1.0.1" EXTRA_OEMAKE="CC='${CC}' AS='${AS}' AR='${AR}' LD='${LD}' FPU='${TARGET_FPU}'" PARALLEL_MAKE = "" +COMPATIBLE_MACHINE = 'c7x0' do_install() { install -d ${D}${bindir} diff --git a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb index 50301aae9d..fb886a2b97 100644 --- a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb +++ b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb @@ -12,6 +12,8 @@ SRC_URI = "http://openzaurus.sf.net/mirror/camera-modules-2.4.18-rmk7-pxa3-embed file://sharpzdc.conf" S = "${WORKDIR}" +COMPATIBLE_MACHINE = '(collie|poodle|tosa)' + inherit module-base do_install() { diff --git a/packages/sharp-binary-only/sharp-flash-header-c700.bb b/packages/sharp-binary-only/sharp-flash-header-c700.bb index c02882482e..789c7c2f01 100644 --- a/packages/sharp-binary-only/sharp-flash-header-c700.bb +++ b/packages/sharp-binary-only/sharp-flash-header-c700.bb @@ -1,6 +1,7 @@ SECTION = "base" SRC_URI = "file://header-c700.bin" LICENSE = "sharp-binary-only" +COMPATIBLE_MACHINE = '(c7x0|spitz|akita)' do_stage() { install -d ${STAGING_LIBDIR}/sharp-flash-header install -m 0644 ${WORKDIR}/header-c700.bin ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin diff --git a/packages/sharp-binary-only/sharp-sdmmc-support.bb b/packages/sharp-binary-only/sharp-sdmmc-support.bb index fa4e66e7e8..6072c94e33 100644 --- a/packages/sharp-binary-only/sharp-sdmmc-support.bb +++ b/packages/sharp-binary-only/sharp-sdmmc-support.bb @@ -7,6 +7,8 @@ RDEPENDS = "kernel (${PV})" PR = "r23" PACKAGE_ARCH = "${MACHINE}" +COMPATIBLE_MACHINE = '(collie|poodle|tosa)' + KERNEL2418 = "2.4.18-rmk7-pxa3-embedix" KERNEL2420 = "2.4.20" diff --git a/packages/vde/.mtn2git_empty b/packages/vde/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/vde/.mtn2git_empty diff --git a/packages/vde/vde_2.0.2.bb b/packages/vde/vde_2.0.2.bb new file mode 100644 index 0000000000..93fe8dc1d3 --- /dev/null +++ b/packages/vde/vde_2.0.2.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "VDE can be used: (i) to create a general purpose tunnel (every protocol that runs on a Ethernet can be put into the tunnel) (ii) to connect a set of virtual machine to the Internet with no need of free access of tuntap (iii) to support mobility: a VDE can stay interconnected despite of the change of virtual cables, i.e. the change of IP addresses and interface in the real world" +LICENSE = GPLv2" +HOMEPAGE = "http://vde.sf.net" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" + +RRECOMMENDS = "kernel-module-tun kernel-module-tap" + +inherit autotools pkgconfig + +SRC_URI = "${SOURCEFORGE_MIRROR}/vde/${P}.tar.bz2" + diff --git a/packages/zaurus-updater/encdec-updater.bb b/packages/zaurus-updater/encdec-updater.bb index 49371a6a49..797a762ebf 100644 --- a/packages/zaurus-updater/encdec-updater.bb +++ b/packages/zaurus-updater/encdec-updater.bb @@ -4,6 +4,8 @@ DESCRIPTION = "A tool to encode and decode the Sharp Zaurus updater.sh skript" SRC_URI = "file://encdec-updater.c" +COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)' + do_compile() { ${CC} -o encdec-updater ${WORKDIR}/encdec-updater.c } diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 21c15c7465..0040ebeebb 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -5,6 +5,7 @@ PR = "r4" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)' SRC_URI = "file://updater.sh \ file://gnu-tar.gz" |
