diff options
63 files changed, 220 insertions, 397 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/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 531ad6818c..8fe6a62061 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -14,7 +14,7 @@ FEED_URIS += " \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" -SRCDATE = "20060424" +SRCDATE = "20060425" # Opie diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index 32dd55d978..f503e928d7 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -87,15 +87,6 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " -DEBIANSLUG_STANDARD_RDEPENDS += "\ -kernel-module-ehci-hcd \ -kernel-module-ohci-hcd \ -kernel-module-uhci-hcd \ -kernel-module-sd-mod \ -kernel-module-usb-storage \ -kernel-module-scsi-mod \ -" - # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 9c9ce228b4..94574c3fe0 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -87,15 +87,6 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " -OPENSLUG_STANDARD_RDEPENDS += "\ -kernel-module-ehci-hcd \ -kernel-module-ohci-hcd \ -kernel-module-uhci-hcd \ -kernel-module-sd-mod \ -kernel-module-usb-storage \ -kernel-module-scsi-mod \ -" - # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/preferred-gpe-versions-2.8.inc b/conf/distro/preferred-gpe-versions-2.8.inc index c62d0aff6e..9c9be528df 100644 --- a/conf/distro/preferred-gpe-versions-2.8.inc +++ b/conf/distro/preferred-gpe-versions-2.8.inc @@ -6,5 +6,7 @@ PREFERRED_PROVIDER_gconf=gconf-dbus PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus +PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" + # - the GPE roadmap doesn't state any versions for 2.8 yet # http://www.handhelds.org/moin/moin.cgi/GPERoadmap diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index bb6c6efa6a..b6f19308d1 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -20,15 +20,6 @@ UCSLUGC_EXTRA_BBFILES ?= "" # setting - either may be set in local.conf to override these values. UCSLUGC_EXTRA_RDEPENDS ?= "" -UCSLUGC_STANDARD_RDEPENDS += "\ -kernel-module-ehci-hcd \ -kernel-module-ohci-hcd \ -kernel-module-uhci-hcd \ -kernel-module-sd-mod \ -kernel-module-usb-storage \ -kernel-module-scsi-mod \ -" - # SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}" 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/conf/machine/h2200.conf b/conf/machine/h2200.conf index 8af4d3577a..126a19569c 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -9,7 +9,7 @@ IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -EXTRA_IMAGECMD_jffs2_h2200 = "--pad --no-cleanmarkers --eraseblock=16384" +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" ROOT_FLASH_SIZE = "32" 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/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb index 921fb7c261..be9dd860b2 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -1,6 +1,7 @@ PR = "r0" #Remove the dash below when 2.0 changes in PV -PV = "2.0+cvs-${SRCDATE}" +DEFAULT_PREFERENCE = "-100000" +PV = "1.9+2.0beta3cvs-${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://no-superimposed-version-on-logo.patch;patch=1 \ diff --git a/packages/gnome/orbit2_2.13.2.bb b/packages/gnome/orbit2_2.13.2.bb index ff80de00c8..d196829add 100644 --- a/packages/gnome/orbit2_2.13.2.bb +++ b/packages/gnome/orbit2_2.13.2.bb @@ -13,7 +13,7 @@ FILES_${PN} += "${libdir}/orbit-2.0/*.so" S = "${WORKDIR}/ORBit2-${PV}" inherit autotools pkgconfig - +PARALLEL_MAKE = "" EXTRA_OECONF = "--disable-gtk-doc" EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'" diff --git a/packages/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch b/packages/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch deleted file mode 100644 index 6ef5ddca91..0000000000 --- a/packages/gpe-today/gpe-today-0.08/gpe-today_makefiles.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff -urNd ../gpe-today-0.08-r0.orig/gpe-today-0.08/Makefile gpe-today-0.08/Makefile ---- ../gpe-today-0.08-r0.orig/gpe-today-0.08/Makefile 2003-11-27 20:25:07.000000000 +0000 -+++ gpe-today-0.08/Makefile 2004-06-22 04:30:22.722392968 +0000 -@@ -1,32 +1,20 @@ - PACKAGE = gpe-today - PREFIX = /usr/local --VERSION = 0.08 -+DEBUG = no - CVSBUILD = no --#DEBUG = yes --#EFENCE = yes --LINGUAS = pt de zh_TW ga ro wa fr sv nl cs sk ru -- --MEMBERS = main todo calendar date xsettings -- --GTKCFLAGS = `pkg-config --cflags gtk+-2.0` --GTKLDFLAGS += `pkg-config --libs gtk+-2.0` -- --CPPFLAGS = -I../libgpewidget -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -D_GNU_SOURCE -+VERSION = 0.08 - --ifeq ($(EFENCE),yes) --LDFLAGS = -lefence --endif -+LINGUAS = pt de zh_TW ga ro wa fr sv nl cs sk ru - --ifeq ($(DEBUG),yes) --CFLAGS = -g --else --CFLAGS = -Os -fomit-frame-pointer -+ifeq ($(CVSBUILD),yes) -+PACKAGE_CPPFLAGS += -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -I../libdisplaymigration -I../libgpepimc -+PACKAGE_LDFLAGS += -L../libeventdb -L../libtododb -L../libxsettings-client -Wl,-rpath-link,../libxsettings -L../libgpepimc - endif -+PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -+PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS) -+PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -leventdb -ltododb -lXsettings-client -ldisplaymigration -lsqlite -lgpepimc - --CFLAGS += -Wall $(GTKCFLAGS) --LDFLAGS += $(GTKLDFLAGS) -L/usr/local/lib -L../libeventdb -leventdb -L../libtododb -ltododb -L../libxsettings -L../libxsettings-client -lXsettings-client -Wl,-rpath-link,../libxsettings --CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" --#CFLAGS += -MD -+MEMBERS = main todo calendar date xsettings - - .SUFFIXES: .d - -@@ -42,10 +30,10 @@ - BUILD = build - endif - --all: $(PACKAGE) all-mo -+all: $(PACKAGE) - - $(PACKAGE): $(OBJS) -- $(CC) -o $@ $^ -L../libgpewidget -lgpewidget -lsqlite $(LDFLAGS) -+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) - - install-program: all $(PACKAGE).desktop - for i in $(PIXMAPS); do install -D -m 644 pixmaps/$$i $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/pixmaps/$$i; done -diff -urNd ../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.dpkg_ipkg gpe-today-0.08/build/Makefile.dpkg_ipkg ---- ../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.dpkg_ipkg 2003-11-27 20:25:07.000000000 +0000 -+++ gpe-today-0.08/build/Makefile.dpkg_ipkg 2004-06-22 04:20:51.000000000 +0000 -@@ -18,8 +18,10 @@ - LIBGPEWIDGET_PC = libgpewidget - endif - -+ifeq ($(IN_LIBGPEWIDGET),) - GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) - GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) -+endif - - GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) - GTKLIBS = $(shell pkg-config --libs gtk+-2.0) -@@ -28,16 +30,16 @@ - STANDARD_CFLAGS = -MD -Wall - - ifeq ($(DEBUG),yes) --STANDARD_CFLAGS += -O2 -g --STANDARD_LDFLAGS = -g -+CFLAGS += -O2 -g -+LDFLAGS = -g - else --STANDARD_CFLAGS += -Os -fomit-frame-pointer -+CFLAGS += -Os -fomit-frame-pointer - endif - - dist: check-source clean dist-prep - rm -rf ../$(PACKAGE)-$(VERSION) - mkdir ../$(PACKAGE)-$(VERSION) -- ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.d" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) -+ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) - ( cd ../$(PACKAGE)-$(VERSION); mkdir build; cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ ; sed 's:^CVSBUILD.*:CVSBUILD = no:' < Makefile > Makefile.new; mv Makefile.new Makefile ) - ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) - rm -rf ../$(PACKAGE)-$(VERSION) -@@ -53,8 +55,13 @@ - - install: install-program install-mo - -+clean-dist: -+ rm -rf familiar/dist familiar/dist.list -+ -+clean: clean-dist -+ - check-source: -- @if ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi -+ @if [ -e familiar ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi - - ipkg: check-source ipkg-prep clean - rm -rf familiar/dist -@@ -68,9 +75,9 @@ - $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program - rm -rf familiar/dist.list - ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list -- rm -f - if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi - md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch -+ rm -rf familiar/dist familiar/dist.list - $(MAKE) printinfo - - dpkg: dist -@@ -89,6 +96,7 @@ - @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" - @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" - @printf "You can use 'make dist-upload' to do that.\n" -+ @printf "You are currently known as USER %s.\n" $(USER) - @printf '-------------------------------------------------------------------------------\n' - - tag: check-source -@@ -101,3 +109,6 @@ - - %.pc: %.pc.in - sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ -+ -+.c.o:; -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ -diff -urNd ../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.translation gpe-today-0.08/build/Makefile.translation ---- ../gpe-today-0.08-r0.orig/gpe-today-0.08/build/Makefile.translation 2003-11-27 20:25:07.000000000 +0000 -+++ gpe-today-0.08/build/Makefile.translation 2004-06-22 04:20:51.000000000 +0000 -@@ -5,7 +5,7 @@ - # use ipkg-build or ipkg-deb-build - IPKG_BUILD := ipkg-build - --TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint/ -+TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint - - ifeq ($(DIR_PO),) - DIR_PO := po -@@ -56,7 +56,7 @@ - ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) - if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi - --clean: clean-po -+clean: clean-po clean-dist-translation - - clean-po: - rm -rf $(DIR_PO)/*.mo -@@ -76,10 +76,17 @@ - - MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) - -+ifndef BUILD -+BUILD = ../build -+endif -+ - transdist := familiar/dist-translation --templates := ../build/familiar -+templates := $(BUILD)/familiar - ipkglist := translation-ipkgs.txt - -+clean-dist-translation: -+ rm -rf $(transdist) $(ipkglist) -+ - real-translation-package: all-mo - rm -rf $(transdist) $(ipkglist) - for LINGUA in $(LINGUAS); do \ -@@ -89,8 +96,7 @@ - install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ - sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ - install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ -- chown -R root.root $(transdist)/$$i; \ -- $(IPKG_BUILD) $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ -+ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ - done - - translation-ipkg: diff --git a/packages/gpe-today/gpe-today-0.09/.mtn2git_empty b/packages/gpe-today/gpe-today-0.09/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/gpe-today/gpe-today-0.09/.mtn2git_empty +++ /dev/null diff --git a/packages/gpe-today/gpe-today-0.09/makefile.patch b/packages/gpe-today/gpe-today-0.09/makefile.patch deleted file mode 100644 index 6f405a6d7f..0000000000 --- a/packages/gpe-today/gpe-today-0.09/makefile.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- /tmp/Makefile 2005-09-01 17:07:30.218823872 +0200 -+++ gpe-today-0.09/Makefile 2005-09-01 17:07:32.698446912 +0200 -@@ -1,7 +1,7 @@ - PACKAGE = gpe-today - PREFIX = /usr/local - VERSION = 0.09 --CVSBUILD = no -+CVSBUILD =no - #DEBUG = yes - #EFENCE = yes - -@@ -9,28 +9,27 @@ - - MEMBERS = main todo calendar date xsettings - --GTKCFLAGS = `pkg-config --cflags gtk+-2.0` --GTKLDFLAGS += `pkg-config --libs gtk+-2.0` -- --CPPFLAGS = -I../libgpewidget -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -D_GNU_SOURCE -- - ifeq ($(EFENCE),yes) --LDFLAGS = -lefence -+PACKAGE_LDFLAGS = -lefence - endif - - ifeq ($(DEBUG),yes) --CFLAGS = -g -+package_CFLAGS = -g - else --CFLAGS = -Os -fomit-frame-pointer -+PACKAGE_CFLAGS = -Os -fomit-frame-pointer - endif - --CFLAGS += -Wall $(GTKCFLAGS) --LDFLAGS += $(GTKLDFLAGS) -L/usr/local/lib -L../libeventdb -leventdb -L../libtododb -ltododb -L../libxsettings -L../libxsettings-client -lXsettings-client -Wl,-rpath-link,../libxsettings -Wl,-rpath-link,../libgpepimc -Wl,-rpath-link,../libdisplaymigration --CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" --#CFLAGS += -MD -- - .SUFFIXES: .d - -+ifeq ($(CVSBUILD),yes) -+PACKAGE_CPPFLAGS += -I../libeventdb -I../libtododb -I../libxsettings -I../libxsettings-client -I../libdisplaymigration -I../libgpepimc -+PACKAGE_LDFLAGS += -L../libeventdb -L../libtododb -L../libxsettings-client -Wl,-rpath-link,../libxsettings -L../libgpepimc -+endif -+PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -+PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS) -+PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) -leventdb -ltododb -lXsettings-client -lsqlite -lgpepimc -+ -+ - OBJS = $(patsubst %,%.o,$(MEMBERS)) - DEPS = $(patsubst %,%.d,$(MEMBERS)) - SOURCES = $(patsubst %,%.c,$(MEMBERS)) -@@ -43,10 +42,10 @@ - BUILD = build - endif - --all: $(PACKAGE) all-mo -+all: $(PACKAGE) - - $(PACKAGE): $(OBJS) -- $(CC) -o $@ $^ -L../libgpewidget -lgpewidget -lsqlite $(LDFLAGS) -+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) - - install-program: all $(PACKAGE).desktop - for i in $(PIXMAPS); do install -D -m 644 pixmaps/$$i $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/pixmaps/$$i; done diff --git a/packages/gpe-today/gpe-today_0.08.bb b/packages/gpe-today/gpe-today_0.08.bb deleted file mode 100644 index 492128a3a5..0000000000 --- a/packages/gpe-today/gpe-today_0.08.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead" -DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb" -SECTION = "gpe" -PRIORITY = "optional" - -SRC_URI += "file://gpe-today_makefiles.patch;patch=1" diff --git a/packages/gpe-today/gpe-today_0.09.bb b/packages/gpe-today/gpe-today_0.09.bb deleted file mode 100644 index 916b5ab50f..0000000000 --- a/packages/gpe-today/gpe-today_0.09.bb +++ /dev/null @@ -1,9 +0,0 @@ -LICENSE = "GPL" -inherit gpe - -DESCRIPTION = "Displays a summary of appointments and tasks for the day ahead" -DEPENDS = "gtk+ libxrandr libxsettings libxsettings-client libgpewidget libdisplaymigration libeventdb libgpepimc libtododb" -SECTION = "gpe" -PRIORITY = "optional" - -SRC_URI += "file://makefile.patch;patch=1" diff --git a/packages/gpe-today/gpe-today_0.11.bb b/packages/gpe-today/gpe-today_0.11.bb index b34bab9d2b..2b02195388 100644 --- a/packages/gpe-today/gpe-today_0.11.bb +++ b/packages/gpe-today/gpe-today_0.11.bb @@ -8,3 +8,5 @@ LICENSE = "GPL" inherit gpe pkgconfig +SRC_URI = "http://www.kernelconcepts.de/~fuchs/files/${P}.tar.gz" + diff --git a/packages/gtkmm/gtkmm_2.4.8.bb b/packages/gtkmm/gtkmm_2.4.8.bb index 9189c91e43..75c47dcfe2 100644 --- a/packages/gtkmm/gtkmm_2.4.8.bb +++ b/packages/gtkmm/gtkmm_2.4.8.bb @@ -12,7 +12,7 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/gtkmm-${PV}.tar.bz2" inherit autotools pkgconfig flow-lossage FILES_${PN} = "${libdir}/lib*.so.*" - +FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/" LIBV = "2.4.0" diff --git a/packages/irda-utils/files/init b/packages/irda-utils/files/init index e7163d3ad3..0da6c3885a 100755 --- a/packages/irda-utils/files/init +++ b/packages/irda-utils/files/init @@ -9,7 +9,7 @@ if [ ! -f /etc/sysconfig/irda ]; then case `module_id` in "HP iPAQ H2200" | "HP iPAQ HX4700") IRDA=yes - DEVICE=/dev/tts/2 + DEVICE=/dev/ttyS2 DONGLE= DISCOVERY= ;; diff --git a/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf b/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf index 9d579eeac1..f08b9a404c 100644 --- a/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf +++ b/packages/ixp425-eth/ixp400-eth-1.5/modprobe.conf @@ -1,3 +1,4 @@ # Add an alias for eth0 to ixp400_eth to cause the S40networking # init script to load the ixp400_eth driver on the first boot alias eth0 ixp400_eth +options ixp400_eth dev_max_count=1
\ No newline at end of file diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index 4430e295fb..8e17faa673 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -4,7 +4,7 @@ MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm" LICENSE = "GPL" -PR = "r10" +PR = "r11" DEPENDS = "ixp4xx-csr" RDEPENDS = "ixp4xx-csr" 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/ep93xx-kernel_2.6.16.bb b/packages/linux/ep93xx-kernel_2.6.16.bb index 1806290a67..a472e9379c 100644 --- a/packages/linux/ep93xx-kernel_2.6.16.bb +++ b/packages/linux/ep93xx-kernel_2.6.16.bb @@ -4,6 +4,8 @@ MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" LICENSE = "GPL" PR = "r0" +COMPATIBLE_MACHINE = "ep93xx" + SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://www.wantstofly.org/~buytenh/ep93xx/derevo17.diff;patch=1 \ http://cowebs.contec.at/ep93xx/EP93XX_Framebuffer1.patch;patch=1 \ 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/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch b/packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch index 59715a024e..c3d919569b 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch @@ -13,7 +13,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -110,8 +113,69 @@ static void nas100d_power_off(void) +@@ -110,8 +113,68 @@ static void nas100d_power_off(void) gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH); } @@ -31,11 +31,6 @@ + err = mtd->read(mtd, 0x0FD8, 6, &retlen, (u8 *) &mac.sa_data); + if (err != 0 || retlen != 6) + printk(KERN_ERR "nas100d: mac addr read failed\n"); -+ else -+ printk(KERN_INFO -+ "nas100d: mac %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", -+ mac.sa_data[0], mac.sa_data[1], mac.sa_data[2], -+ mac.sa_data[3], mac.sa_data[4], mac.sa_data[5]); + } +} + @@ -63,6 +58,10 @@ + if (event == NETDEV_REGISTER && is_valid_ether_addr(mac.sa_data)) { + mac.sa_family = dev->type; + dev_set_mac_address(dev, &mac); ++ printk(KERN_INFO ++ "ixp400_eth: MAC address now set to %.2x:%.2x:%.2x:%.2x:%.2x:%.2x for port 0\n", ++ mac.sa_data[0], mac.sa_data[1], mac.sa_data[2], ++ mac.sa_data[3], mac.sa_data[4], mac.sa_data[5]); + } + + return NOTIFY_DONE; diff --git a/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch b/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch index 31c5f04ebe..e96c5f9e75 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch @@ -13,7 +13,7 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> -@@ -117,6 +120,59 @@ static void nslu2_power_off(void) +@@ -117,6 +120,58 @@ static void nslu2_power_off(void) gpio_line_set(NSLU2_PO_GPIO, IXP4XX_GPIO_HIGH); } @@ -24,18 +24,13 @@ +static struct sockaddr mac; + +static void nslu2_flash_add(struct mtd_info *mtd) { -+ if (strcmp(mtd->name, "RedBoot config") == 0) { ++ if (strcmp(mtd->name, "RedBoot") == 0) { + size_t retlen; + int err; + /* the mac addr is at a known offset */ -+ err = mtd->read(mtd, 0x3FFD8, 6, &retlen, (u8 *) &mac.sa_data); ++ err = mtd->read(mtd, 0x3FFB0, 6, &retlen, (u8 *) &mac.sa_data); + if (err != 0 || retlen != 6) + printk(KERN_ERR "nslu2: mac addr read failed\n"); -+ else -+ printk(KERN_INFO -+ "nslu2: mac %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n", -+ mac.sa_data[0], mac.sa_data[1], mac.sa_data[2], -+ mac.sa_data[3], mac.sa_data[4], mac.sa_data[5]); + } +} + @@ -61,6 +56,10 @@ + if (event == NETDEV_REGISTER && is_valid_ether_addr(mac.sa_data)) { + mac.sa_family = dev->type; + dev_set_mac_address(dev, &mac); ++ printk(KERN_INFO ++ "ixp400_eth: MAC address now set to %.2x:%.2x:%.2x:%.2x:%.2x:%.2x for port 0\n", ++ mac.sa_data[0], mac.sa_data[1], mac.sa_data[2], ++ mac.sa_data[3], mac.sa_data[4], mac.sa_data[5]); + } + + return NOTIFY_DONE; diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index 66d1c38e42..5d02946842 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16.bb @@ -8,7 +8,7 @@ PR_CONFIG = "1" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r3.${PR_CONFIG}" +PR = "r6.${PR_CONFIG}" include ixp4xx-kernel.inc 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-2.6.16/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch index c7be5b3373..3d5d197920 100644 --- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch +++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch @@ -17,7 +17,7 @@ Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x76dc4190, 0xcfba9599), /* Seagate 8GB microdrive */ ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), 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-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 8d1541cb0b..6cc3253f8d 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r9" +PR = "r10" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ 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/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/gpe-today/gpe-today-0.08/.mtn2git_empty b/packages/udev/files/slugos/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-today/gpe-today-0.08/.mtn2git_empty +++ b/packages/udev/files/slugos/.mtn2git_empty diff --git a/packages/udev/files/slugos/mount.blacklist b/packages/udev/files/slugos/mount.blacklist new file mode 100644 index 0000000000..210702f837 --- /dev/null +++ b/packages/udev/files/slugos/mount.blacklist @@ -0,0 +1,4 @@ +ram[0-9]$ +mtdblock[0-9]$ +hd[a-z]$ +sd[a-z]$ diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 0b6274f45d..1ae6f5e1e0 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -14,7 +14,7 @@ include udev.inc INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ." -PR = "r8" +PR = "r9" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" diff --git a/packages/udev/udev_089.bb b/packages/udev/udev_089.bb index ba1e5b4161..348e592e80 100644 --- a/packages/udev/udev_089.bb +++ b/packages/udev/udev_089.bb @@ -35,6 +35,7 @@ do_install () { install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf if [ "${UDEV_DEVFS_RULES}" = "1" ]; then install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules fi 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" |