diff options
24 files changed, 211 insertions, 287 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/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/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/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/gpe-today/gpe-today-0.08/.mtn2git_empty b/packages/rott/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpe-today/gpe-today-0.08/.mtn2git_empty +++ 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}" |
