From 0c2df02716f3ac58962352d64cd19c4732d000d8 Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Sat, 11 Nov 2006 19:55:43 +0000
Subject: Unslung: Slingbox: df: fixed handling of root pseudo-devices for
 Unslung

---
 packages/busybox/slingbox-1.2.2/df_rootfs.patch | 34 +++++++++++++++++++++++++
 packages/busybox/slingbox_1.2.2.bb              |  3 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 packages/busybox/slingbox-1.2.2/df_rootfs.patch

(limited to 'packages')

diff --git a/packages/busybox/slingbox-1.2.2/df_rootfs.patch b/packages/busybox/slingbox-1.2.2/df_rootfs.patch
new file mode 100644
index 0000000000..fa7e61af15
--- /dev/null
+++ b/packages/busybox/slingbox-1.2.2/df_rootfs.patch
@@ -0,0 +1,34 @@
+--- busybox-1.2.2/coreutils/df.c.orig	2006-11-11 13:25:00.000000000 -0600
++++ busybox-1.2.2/coreutils/df.c	2006-11-11 13:23:15.000000000 -0600
+@@ -47,6 +47,7 @@
+ 	struct statfs s;
+ 	static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */
+ 	const char *disp_units_hdr = hdr_1k;
++	int root_done = 0;
+ 
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
+ 	bb_opt_complementally = "h-km:k-hm:m-hk";
+@@ -112,16 +113,19 @@
+ 									   ) / (blocks_used + s.f_bavail);
+ 			}
+ 
+-			if (strcmp(device, "rootfs") == 0) {
+-				continue;
+-			} else if (strcmp(device, "/dev/root") == 0) {
++			if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) {
+ 				/* Adjusts device to be the real root device,
+ 				* or leaves device alone if it can't find it */
+-				if ((device = find_block_device("/")) == NULL) {
++				if ((device = find_block_device(mount_point)) == NULL) {
+ 					goto SET_ERROR;
+ 				}
+ 			}
+ 
++			if (strcmp(mount_point, "/") == 0) {
++				if (root_done) continue;
++				root_done = 1;
++			}
++
+ #ifdef CONFIG_FEATURE_HUMAN_READABLE
+ 			bb_printf("%-20s %9s ", device,
+ 					  make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
diff --git a/packages/busybox/slingbox_1.2.2.bb b/packages/busybox/slingbox_1.2.2.bb
index 2468680ba1..56d75f943e 100644
--- a/packages/busybox/slingbox_1.2.2.bb
+++ b/packages/busybox/slingbox_1.2.2.bb
@@ -4,12 +4,13 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
            file://wget-long-options.patch;patch=1 \
            file://lazy_umount.patch;patch=1 \
+           file://df_rootfs.patch;patch=1 \
            file://slingbox_name.patch;patch=1 \
            file://halt.patch;patch=1" \
            file://slingbox.patch;patch=1"
-- 
cgit v1.2.3


From 446553e3d9f4f67edd09463954bbfa2582b72a8f Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Sat, 11 Nov 2006 19:58:44 +0000
Subject: Unslung: rootfs: unsling: skip the lost+found directory

---
 packages/nslu2-binary-only/unslung-rootfs/unsling | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/nslu2-binary-only/unslung-rootfs/unsling b/packages/nslu2-binary-only/unslung-rootfs/unsling
index 79584df8b7..6c4dc4ca52 100755
--- a/packages/nslu2-binary-only/unslung-rootfs/unsling
+++ b/packages/nslu2-binary-only/unslung-rootfs/unsling
@@ -185,9 +185,10 @@ fi
 # /usr/bin/find / -xdev -print | /usr/bin/cpio -p -d -m -u $targ
 # rm -rf $targ/dev ; mv $targ/dev.state $targ/dev
 # rm -rf $targ/var ; mv $targ/var.state $targ/var
-echo "./var/tmp"    > /tmp/xfile
+echo "./var/tmp" > /tmp/xfile
 echo "./dev.state" >> /tmp/xfile
 echo "./var.state" >> /tmp/xfile
+echo "./lost+found" >>/tmp/xfile
 mkdir -p /tmp/tmprootfs
 /bin/mount /dev/mtdblock4 /tmp/tmprootfs
 /bin/tar -c -C /tmp/tmprootfs -X /tmp/xfile -f - . | (cd $targ; /bin/tar -x -f -)
-- 
cgit v1.2.3


From c96e2bdacc17e026911a75b207fbad39b4b5dd17 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 11 Nov 2006 20:32:28 +0000
Subject: faad2: add a gcc4 fix * as a side note: thank $deity that we don't
 use that line-ending mangling bitkeeper anymore, yay!

---
 packages/faad2/faad2-2.0/faad2-gcc-fix.patch | 11 +++++++++++
 packages/faad2/faad2_2.0.bb                  |  7 ++++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 packages/faad2/faad2-2.0/faad2-gcc-fix.patch

(limited to 'packages')

diff --git a/packages/faad2/faad2-2.0/faad2-gcc-fix.patch b/packages/faad2/faad2-2.0/faad2-gcc-fix.patch
new file mode 100644
index 0000000000..943b89a53f
--- /dev/null
+++ b/packages/faad2/faad2-2.0/faad2-gcc-fix.patch
@@ -0,0 +1,11 @@
+--- /tmp/mp4ff.c	2006-11-11 21:25:07.000000000 +0100
++++ faad2/common/mp4ff/mp4ff.c	2006-11-11 21:25:20.348554000 +0100
+@@ -87,7 +87,7 @@
+     if (ff) free(ff);
+ }
+ 
+-static void mp4ff_track_add(mp4ff_t *f)
++void mp4ff_track_add(mp4ff_t *f)
+ {
+     f->total_tracks++;
+ 
diff --git a/packages/faad2/faad2_2.0.bb b/packages/faad2/faad2_2.0.bb
index 18df582a4e..a856a1e45f 100644
--- a/packages/faad2/faad2_2.0.bb
+++ b/packages/faad2/faad2_2.0.bb
@@ -4,12 +4,13 @@ SECTION = "libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = ""
-PR="r1"
+PR="r2"
 
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${PN}-${PV}.zip \
-           file://Makefile.am"
+           file://faad2-gcc-fix.patch;patch=1 \
+ 	   file://Makefile.am"
 
 S="${WORKDIR}/${PN}"
 
@@ -17,7 +18,7 @@ do_configure_prepend() {
         mv ${WORKDIR}/Makefile.am ${S}/
 }
 
-PACKAGES = "${PN} libfaad libfaad-dev libmp4ff libmp4ff-dev" 
+PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" 
 
 FILES_${PN} = "${bindir}/faad"
 
-- 
cgit v1.2.3


From 6c336754040826bcb117adcee801471ed69eed94 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 11 Nov 2006 22:25:35 +0000
Subject: angstrom: fix some parse errors to make Holger happy

---
 packages/angstrom/angstrom-bootmanager-image.bb | 2 +-
 packages/angstrom/angstrom-bootstrap-image.bb   | 2 +-
 packages/angstrom/angstrom-gpe-image.bb         | 2 +-
 packages/angstrom/angstrom-version.bb           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages')

diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb
index 8c2fd9cc09..9a0bf12a08 100644
--- a/packages/angstrom/angstrom-bootmanager-image.bb
+++ b/packages/angstrom/angstrom-bootmanager-image.bb
@@ -1,5 +1,5 @@
 #Angstrom bootmanager image
-LICENSE = MIT
+LICENSE = "MIT"
 PR = "r0"
 
 DEPENDS = "task-angstrom"
diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb
index eb01bd53ec..838ad249c0 100644
--- a/packages/angstrom/angstrom-bootstrap-image.bb
+++ b/packages/angstrom/angstrom-bootstrap-image.bb
@@ -1,5 +1,5 @@
 #Angstrom bootstrap image
-LICENSE = MIT
+LICENSE = "MIT"
 PR = "r2"
 
 DEPENDS = "task-base"
diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb
index ab632f91a9..c0678431b2 100644
--- a/packages/angstrom/angstrom-gpe-image.bb
+++ b/packages/angstrom/angstrom-gpe-image.bb
@@ -1,5 +1,5 @@
 #Angstrom GPE image
-LICENSE = MIT
+LICENSE = "MIT"
 PR = "r4"
 
 PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb
index 763fbf22dc..e6545117b8 100644
--- a/packages/angstrom/angstrom-version.bb
+++ b/packages/angstrom/angstrom-version.bb
@@ -1,4 +1,4 @@
-PV = ${DISTRO_VERSION}
+PV = "${DISTRO_VERSION}"
 
 PACKAGES = "${PN}"
 
-- 
cgit v1.2.3


From 6913c5815ed2be900e2104e2ea9338eecdee73a5 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 11 Nov 2006 22:27:03 +0000
Subject: eds-dbus: fix parse error

---
 packages/eds/eds-dbus_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index d5f32eb7dd..e56b41e595 100644
--- a/packages/eds/eds-dbus_svn.bb
+++ b/packages/eds/eds-dbus_svn.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/trunk"
 inherit autotools pkgconfig
 
 # -ldb needs this on some platforms
-export LDFLAGS += "-lpthread"
+LDFLAGS += "-lpthread"
 
 EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR}/${HOST_SYS} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc"
 
-- 
cgit v1.2.3


From fd6b7558b3d515b25dd500293aee347bcbc38039 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 11 Nov 2006 22:34:26 +0000
Subject: gnome-doc-utils: fix another parser error to make Holger even happier

---
 packages/gnome/gnome-doc-utils_0.7.1.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
index 66d34f09be..69353ee88e 100644
--- a/packages/gnome/gnome-doc-utils_0.7.1.bb
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -7,6 +7,4 @@ FILES_${PN} += "${datadir}/xml*"
 
 do_stage() {
 	autotools_stage_all
-	}
-
-
+}
-- 
cgit v1.2.3


From d1b1231953cce26a8d087a087cc54d83b568c20a Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 12 Nov 2006 09:02:18 +0000
Subject: slugos: Changed SLUGOS_FLASH_IMAGE to be multi-valued, to allow for
 multiple target upgrade image formats.  Changed the image name, so that it
 overwrites the previously built image (and doesn't fill the autobuilder
 disks).

---
 packages/images/slugos-image.bb  | 9 +++++----
 packages/images/unslung-image.bb | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 7073105e24..90a5cefcbe 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -6,11 +6,12 @@
 DESCRIPTION = "Generic SlugOS image"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r36"
+PR = "r37"
 
 # SLUGOS_IMAGENAME defines the name of the image to be build, if it
 # is not set this package will be skipped!
 IMAGE_BASENAME = "${SLUGOS_IMAGENAME}"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 IMAGE_FSTYPES = "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--pad --${SLUGOS_IMAGESEX} --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
@@ -113,13 +114,13 @@ python () {
 # LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot)
 # it is a bad idea to produce flash images without a valid RedBoot - that allows
 # an innocent user upgrade attempt to instantly brick the NSLU2.
-PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}"
-PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'yes']}"
+PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
+PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
 
 NSLU2_SLUGIMAGE_ARGS ?= ""
 
 nslu2_pack_image() {
-	if test '${SLUGOS_FLASH_IMAGE}' = yes
+	if test '${SLUGOS_FLASH_IMAGE}' = nslu2
 	then
 		install -d ${DEPLOY_DIR_IMAGE}/slug
 		install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index d585414f1f..82ca8313fd 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,7 +1,8 @@
 LICENSE = MIT
-PR = "r23"
+PR = "r24"
 
 IMAGE_BASENAME = "unslung"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
 
 IMAGE_LINGUAS = ""
 USE_DEVFS = "1"
-- 
cgit v1.2.3


From 75ceb3d82ed98c52ea5a937c4fa23d3bf386404f Mon Sep 17 00:00:00 2001
From: Alan Carvalho de Assis <acassis@gmail.com>
Date: Sun, 12 Nov 2006 13:27:11 +0000
Subject: ipatience: add 0.1, closes #1574

---
 packages/ipatience/.mtn2git_empty       |   0
 packages/ipatience/files/.mtn2git_empty |   0
 packages/ipatience/files/fix-make.patch | 569 ++++++++++++++++++++++++++++++++
 packages/ipatience/ipatience_0.1.bb     |  14 +
 4 files changed, 583 insertions(+)
 create mode 100644 packages/ipatience/.mtn2git_empty
 create mode 100644 packages/ipatience/files/.mtn2git_empty
 create mode 100644 packages/ipatience/files/fix-make.patch
 create mode 100644 packages/ipatience/ipatience_0.1.bb

(limited to 'packages')

diff --git a/packages/ipatience/.mtn2git_empty b/packages/ipatience/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ipatience/files/.mtn2git_empty b/packages/ipatience/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ipatience/files/fix-make.patch b/packages/ipatience/files/fix-make.patch
new file mode 100644
index 0000000000..3e3ad80eef
--- /dev/null
+++ b/packages/ipatience/files/fix-make.patch
@@ -0,0 +1,569 @@
+diff -urNd ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg ipatience/build/Makefile.dpkg_ipkg
+--- ../ipatience-0.1-r2/ipatience/build/Makefile.dpkg_ipkg	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/build/Makefile.dpkg_ipkg	2006-11-08 16:41:55.000000000 +0000
+@@ -0,0 +1,114 @@
++## Please read the README in this directory to see how to use this
++## Makefile snippet
++
++# Let's use whatever clean target the specific app provides
++
++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
++
++# URL to source tarball
++SOURCE = ftp://gpe.handhelds.org/projects/gpe/source/$(PACKAGE)-$(VERSION).tar.gz
++
++# can change this to e.g. /var/tmp/deb
++DEB_PATH = ../deb
++
++ifeq ($(CVSBUILD),yes)
++LIBGPEWIDGET_PC = libgpewidget-uninstalled
++PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget
++else
++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)
++
++STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
++STANDARD_CFLAGS = -MD -Wall
++
++ifeq ($(DEBUG),yes)
++CFLAGS += -O2 -g
++LDFLAGS = -g
++else
++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 "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -)
++	( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile )
++	( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz )
++	rm -rf ../$(PACKAGE)-$(VERSION)
++	$(MAKE) printinfo
++
++dist-upload: dist
++	scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@handhelds.org:/home/ftp/projects/gpe/source/
++
++dist-prep:
++ipkg-prep:
++install-mo:
++# empty, can be filled in Makefile.translation
++
++install: install-program install-mo
++
++clean-dist:
++	rm -rf familiar/dist familiar/dist.list
++
++clean: clean-dist
++
++check-source:
++	@if [ -f familiar/$(CONTROL) ] && ! 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
++	mkdir -p familiar/dist/CONTROL
++	sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control
++	if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi
++	if test -e familiar/preinst;   then install familiar/preinst   familiar/dist/CONTROL; fi
++	if test -e familiar/postinst;  then install familiar/postinst  familiar/dist/CONTROL; fi
++	if test -e familiar/prerm;     then install familiar/prerm     familiar/dist/CONTROL; fi
++	if test -e familiar/postrm;    then install familiar/postrm    familiar/dist/CONTROL; fi
++	$(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
++	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
++	mkdir -p $(DEB_PATH)
++	( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz )
++	mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian
++	for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done
++
++CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_])
++printinfo:
++	@printf '-------------------------------------------------------------------------------\n'
++	@printf "If this becomes a package release, please add a CVS tag.\n"
++	@printf "You can use 'make tag' for that, it will execute\n"
++	@printf "   cvs tag %s\n" $(CVSTAG)
++	@printf "Please upload a tarball (created with 'make dist') to\n"
++	@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
++	cvs tag $(CVSTAG)
++
++retag: check-source
++	cvs tag -F $(CVSTAG)
++
++source: tag dist-upload
++
++%.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 ../ipatience-0.1-r2/ipatience/build/Makefile.translation ipatience/build/Makefile.translation
+--- ../ipatience-0.1-r2/ipatience/build/Makefile.translation	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/build/Makefile.translation	2006-11-08 16:41:55.000000000 +0000
+@@ -0,0 +1,107 @@
++.SUFFIXES: .mo .po .pot .po8
++
++CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi`
++
++# use ipkg-build or ipkg-deb-build
++IPKG_BUILD := ipkg-build
++
++TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint
++
++ifeq ($(DIR_PO),)
++DIR_PO := po
++endif
++
++ifeq ($(BINPACKAGE),)
++BINPACKAGE := $(PACKAGE)
++endif
++
++mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS))
++po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
++
++ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present)
++desktop-files += $(PACKAGE).desktop
++endif
++
++ifneq ($(EXTRA_DESKTOPS),)
++desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS))
++endif
++
++all-mo: $(mo-files)
++
++all-desktop: $(desktop-files)
++
++install-mo: all-mo
++	if [ "$(ENABLE_NLS)" != "no" ]; then \
++		if [ "x$(LINGUAS)" != "x" ]; then \
++			for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \
++		fi; \
++	fi;
++
++.po8.mo:;
++	if [ "$(ENABLE_NLS)" != "no" ]; then \
++		msgfmt -o $@ $<; \
++	fi;
++
++.po.po8:;
++	CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@
++
++update-po: $(po-files) extract-po
++
++dist-prep: update-po freshen-po
++# empty
++
++ifeq ($(CVSBUILD),yes)
++ipkg-prep: freshen-po
++# empty
++endif
++
++extract-po:
++	mkdir -p $(DIR_PO)
++	( 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-dist-translation
++
++clean-po:
++	rm -rf $(DIR_PO)/*.mo
++	for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done
++
++%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS))
++	intltool-merge -u -d $(DIR_PO) $< $@
++
++freshen-po:
++	rm -rf tmp-po
++	mkdir tmp-po
++	cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done
++	for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done
++	rm -rf tmp-po
++
++# ------------------------------------------------------------------------
++
++MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-)
++
++ifndef BUILD
++BUILD = ../build
++endif
++
++transdist := familiar/dist-translation
++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 \
++		i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \
++		mkdir -p $(transdist)/$$i/CONTROL; \
++		mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \
++		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; \
++		$(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \
++	done
++
++translation-ipkg:
++	make PREFIX=/usr real-translation-package
+diff -urNd ../ipatience-0.1-r2/ipatience/Imakefile ipatience/Imakefile
+--- ../ipatience-0.1-r2/ipatience/Imakefile	2001-01-31 05:25:03.000000000 +0000
++++ ipatience/Imakefile	1970-01-01 00:00:00.000000000 +0000
+@@ -1,11 +0,0 @@
+-LOCAL_LIBRARIES=-lfltk $(XFTLIB) $(XLIB) -lm
+-SRCS=main.cc table.cc cards.cc\
+-     aces.cc calc.cc canfield.cc eight.cc freecell.cc \
+-     golf.cc klondike.cc montana.cc spider.cc spiderette.cc \
+-     tabby.cc towers.cc vegas.cc wish.cc yukon.cc
+-OBJS=main.o table.o cards.o \
+-     aces.o calc.o canfield.o eight.o freecell.o \
+-     golf.o klondike.o montana.o spider.o spiderette.o \
+-     tabby.o towers.o vegas.o wish.o yukon.o
+-
+-ComplexProgramTarget(ipatience)
+diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.desktop ipatience/ipatience.desktop
+--- ../ipatience-0.1-r2/ipatience/ipatience.desktop	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/ipatience.desktop	2006-11-11 15:59:25.000000000 +0000
+@@ -0,0 +1,9 @@
++[Desktop Entry]
++Name=Ipatience
++Comment=The Patience Game
++Exec=ipatience -small
++Terminal=0
++Type=Application
++Icon=ipatience.xpm
++Categories=Games
++StartupNotify=True
+diff -urNd ../ipatience-0.1-r2/ipatience/ipatience.xpm ipatience/ipatience.xpm
+--- ../ipatience-0.1-r2/ipatience/ipatience.xpm	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/ipatience.xpm	2006-11-11 15:58:52.000000000 +0000
+@@ -0,0 +1,194 @@
++/* XPM */
++static char * ipatience_xpm[] = {
++"32 32 159 2",
++"  	c None",
++". 	c #000000",
++"+ 	c #181817",
++"@ 	c #525251",
++"# 	c #595959",
++"$ 	c #464644",
++"% 	c #0D0D0D",
++"& 	c #F4F4F1",
++"* 	c #ECEDEB",
++"= 	c #E6E9E9",
++"- 	c #F1F1EE",
++"; 	c #D5D3D0",
++"> 	c #151515",
++", 	c #748AA2",
++"' 	c #71879E",
++") 	c #6E839A",
++"! 	c #6C8197",
++"~ 	c #657B92",
++"{ 	c #95A4B4",
++"] 	c #D9D8D5",
++"^ 	c #4D6780",
++"/ 	c #3B4B5C",
++"( 	c #39414A",
++"_ 	c #344353",
++": 	c #494E53",
++"< 	c #616364",
++"[ 	c #1C1C1C",
++"} 	c #5C738A",
++"| 	c #41596F",
++"1 	c #4E5152",
++"2 	c #DEDEDB",
++"3 	c #E0DFDB",
++"4 	c #E2E2DE",
++"5 	c #E5E5E3",
++"6 	c #BCBBB8",
++"7 	c #546C82",
++"8 	c #59636D",
++"9 	c #B5BEC7",
++"0 	c #99A9B9",
++"a 	c #97A7B8",
++"b 	c #909FAF",
++"c 	c #364D62",
++"d 	c #5F6163",
++"e 	c #3E576C",
++"f 	c #3E5266",
++"g 	c #384757",
++"h 	c #8B8B8A",
++"i 	c #495D73",
++"j 	c #456079",
++"k 	c #2F4457",
++"l 	c #A1A09F",
++"m 	c #999896",
++"n 	c #9B9B9A",
++"o 	c #A3A3A2",
++"p 	c #4D4D4C",
++"q 	c #445B71",
++"r 	c #D4CBC6",
++"s 	c #777572",
++"t 	c #ADABA7",
++"u 	c #EAE9E6",
++"v 	c #52677C",
++"w 	c #334A5E",
++"x 	c #4C667E",
++"y 	c #94928F",
++"z 	c #6A6967",
++"A 	c #D3D1CD",
++"B 	c #E8E7E2",
++"C 	c #6B7F95",
++"D 	c #4D6276",
++"E 	c #5C7186",
++"F 	c #959593",
++"G 	c #686765",
++"H 	c #585654",
++"I 	c #B0AFAD",
++"J 	c #394E62",
++"K 	c #A19F9C",
++"L 	c #DAD7D3",
++"M 	c #ADADA9",
++"N 	c #283745",
++"O 	c #D3C3BC",
++"P 	c #C48F7D",
++"Q 	c #C88167",
++"R 	c #C8866E",
++"S 	c #CA9989",
++"T 	c #677B8F",
++"U 	c #62778C",
++"V 	c #CD7C60",
++"W 	c #ED8247",
++"X 	c #FB9B53",
++"Y 	c #F58E4B",
++"Z 	c #DF6F3C",
++"` 	c #E97B42",
++" .	c #F88D4A",
++"..	c #D85B31",
++"+.	c #E5E7E8",
++"@.	c #C39587",
++"#.	c #FEA458",
++"$.	c #F47C3F",
++"%.	c #F4763B",
++"&.	c #EE612E",
++"*.	c #E44C22",
++"=.	c #C1492E",
++"-.	c #C2AAA3",
++";.	c #BD7A67",
++">.	c #F98442",
++",.	c #F26C35",
++"'.	c #E9592A",
++").	c #E2431D",
++"!.	c #DC3C1A",
++"~.	c #D63113",
++"{.	c #C54022",
++"].	c #B3948C",
++"^.	c #5B6E82",
++"/.	c #BC887A",
++"(.	c #E2582B",
++"_.	c #ED5727",
++":.	c #D83817",
++"<.	c #D32D12",
++"[.	c #CD240D",
++"}.	c #C71A08",
++"|.	c #CE2F12",
++"1.	c #BD482C",
++"2.	c #B9A49E",
++"3.	c #B9C1C5",
++"4.	c #9CA3A7",
++"5.	c #6B6A69",
++"6.	c #2A3846",
++"7.	c #CBC3BF",
++"8.	c #BE533A",
++"9.	c #CB2A0F",
++"0.	c #C93F1D",
++"a.	c #AE6B5A",
++"b.	c #CDCBC8",
++"c.	c #302F2E",
++"d.	c #8A8987",
++"e.	c #53697C",
++"f.	c #CA1D0A",
++"g.	c #C33C1C",
++"h.	c #C5BCB8",
++"i.	c #C6B4AE",
++"j.	c #B05D4D",
++"k.	c #C42D14",
++"l.	c #B73F22",
++"m.	c #A87164",
++"n.	c #85929D",
++"o.	c #7C8B97",
++"p.	c #44566A",
++"q.	c #B36A5B",
++"r.	c #C8371A",
++"s.	c #B34428",
++"t.	c #A57F75",
++"u.	c #CBC9C7",
++"v.	c #A88178",
++"w.	c #868683",
++"x.	c #7F7F7D",
++"y.	c #C6C5C2",
++"z.	c #72716F",
++"A.	c #262625",
++"B.	c #50504F",
++"                                                                ",
++"    . . . . . . . . . . . . . . . . .                           ",
++"  . + @ # # # # # # # # # # # # # $ % . .                       ",
++"  . @ & * * = * * = = * * = = * - ; > . . .                     ",
++"  . # * , , , , ' ' ) ) ! ! ! ~ { ] + . .                       ",
++"  . # = ~ ^ / ( ( _ ( ( ( ( ( ( : < [ + + > . . .               ",
++"  . # = } | 1 ] ] 2 2 2 2 2 2 2 2 2 3 4 5 6 % . . .             ",
++"  . # = ' 7 8 - 9 0 0 a a a a { { { { b 9 2 + . .               ",
++"  . # = 7 c d = ! } 7 e : f / / / / g g 8 h % . . . . .         ",
++"  . # = ~ i < = 7 j k d l m n o l l l l o o o o o o p . . .     ",
++"  . # = ~ q < = ' ~ / o r s t 4 4 4 u u u * * * & & m . . .     ",
++"  . # = v w d = } x k o y z z A 4 4 4 4 4 4 B u = - m . . .     ",
++"  . # = C D < = E x k F G G H I 4 4 4 4 B u u u = & m . . .     ",
++"  . # = 7 J < = ! ~ / h K L M l r 3 4 4 L L 5 * * & n . . .     ",
++"  . # = 7 / < = x q N n 4 3 O P Q R S S Q Q S L * - n . . .     ",
++"  . # = T i < = U 7 _ o u r V W X Y Z `  .` ..P ] - m . . .     ",
++"  . # +.D k d = U 7 ( o B @.` #.X  .$.$.%.&.*.=.-.- n . . .     ",
++"  . # = E f d = D e N o 3 ;.$.>.,.'.'.).!.~.~.{.].* n . . .     ",
++"  . # = ^.f d = T } g l 5 /.(._.).:.:.<.[.}.|.1.2.- n . . .     ",
++"  . # & 3.4.5.= v q 6.o * 7.8.!.<.<.[.[.}.9.0.a.b.- m . . .     ",
++"  . c.F l d.G 5 e.q N o & u -.8.|.[.f.}.9.g.a.h.5 & m . . .     ",
++"  . . . . . # = E v ( o & u 4 i.j.k.[.9.l.m.7.5 * & n . . .     ",
++"    . . . . # * n.o.p.l & u * u 7.q.r.s.t.u.A 5 - 2 h . . .     ",
++"    . . . . $ A L 3 h o & - * * u r q.v.A * t F b.w.x.. . .     ",
++"          . . + + + % o & * * * * u ; L u - y.@ # s F . . .     ",
++"            . . . . . o & * * * * * * * * * u w.z.I n . . .     ",
++"            . . . . . F & - * * * - * - * - - u.m 4 h . . .     ",
++"              . .   . A.B.@ B.@ B.B.@ @ @ B.@ @ @ @ A.. . .     ",
++"                    . . . . . . . . . . . . . . . . . . . .     ",
++"                      . . . . . . . . . . . . . . . . . . .     ",
++"                      . . . . . . . . . . . . . . . . . . .     ",
++"                                                                "};
+diff -urNd ../ipatience-0.1-r2/ipatience/main.cc ipatience/main.cc
+--- ../ipatience-0.1-r2/ipatience/main.cc	2001-02-09 08:15:27.000000000 +0000
++++ ipatience/main.cc	2006-11-02 16:37:55.000000000 +0000
+@@ -549,7 +549,7 @@
+ 
+ int main (int argc, char **argv) {
+     int i;
+-    small = -1;
++    small = 0;
+     Fl::args(argc,argv,i,arg_cb);
+     fl_open_display ();
+     if (small == -1)
+diff -urNd ../ipatience-0.1-r2/ipatience/Makefile ipatience/Makefile
+--- ../ipatience-0.1-r2/ipatience/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ ipatience/Makefile	2006-11-10 18:03:49.000000000 +0000
+@@ -0,0 +1,39 @@
++PREFIX = /usr
++PACKAGE = ipatience
++DEBUG = no
++CVSBUILD = no
++VERSION = 0.10
++
++MEMBERS = main aces calc canfield cards eight freecell golf klondike main montana spider spiderette tabby table towers vegas wish yukon 
++
++PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS)
++PACKAGE_CFLAGS += $(STANDARD_CFLAGS) 
++PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) -lfltk -lm
++
++DEPS = $(patsubst %,%.d,$(MEMBERS))
++OBJS = $(patsubst %,%.o,$(MEMBERS))
++SOURCES = $(patsubst %,%.cc,$(MEMBERS))
++
++ifeq ($(CVSBUILD),yes)
++BUILD = ../build
++else
++BUILD = build
++endif
++
++all: ipatience
++
++ipatience: $(OBJS)
++	$(CXX) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
++
++install-program: all ipatience.desktop
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -s ipatience $(DESTDIR)$(PREFIX)/bin/ipatience
++	install -d $(DESTDIR)$(PREFIX)/share/applications
++	install -m 644 ipatience.desktop $(DESTDIR)$(PREFIX)/share/applications/
++	install -D -m 644 ipatience.xpm $(DESTDIR)$(PREFIX)/share/pixmaps/ipatience.xpm
++
++clean: 
++	rm -f ipatience $(OBJS) $(DEPS) *.ipk *~ *.bak
++
++include $(BUILD)/Makefile.dpkg_ipkg
++-include $(DEPS)
+diff -urNd ../ipatience-0.1-r2/ipatience/table.cc ipatience/table.cc
+--- ../ipatience-0.1-r2/ipatience/table.cc	2001-06-22 00:32:12.000000000 +0000
++++ ipatience/table.cc	2006-11-10 17:06:56.000000000 +0000
+@@ -231,9 +231,9 @@
+ 	suit_bitmap = suit[Suit(card) >> 4];
+ 	
+ 	if (rank_bitmap != 0)
+-	    rank_width = rank_bitmap->w;
++	    rank_width = (short) rank_bitmap->w();
+ 	if (suit_bitmap != 0)
+-	    suit_width = suit_bitmap->w;
++	    suit_width = (short) suit_bitmap->w();
+     
+ 	if (horizontal)
+ 	{
+@@ -723,7 +723,7 @@
+ }
+ 
+ static PatI
+-abs (PatI x)
++absx (PatI x)
+ {
+     return x >= 0 ? x : -x;
+ }
+@@ -735,7 +735,7 @@
+ 	game.srcCard != NullIndex)
+     {
+ 	if (getTimeInMillis () >= downTime + TRACK_TIMEOUT ||
+-	    abs (x - downX) > TRACK_BOX || abs (y - downY) > TRACK_BOX)
++	    absx (x - downX) > TRACK_BOX || absx (y - downY) > TRACK_BOX)
+ 	{
+ 	    tracking = CardStartAnimate (x, y,
+ 					 game.srcStack, 
+@@ -985,17 +985,17 @@
+ 	cardLabelHeight = 0;
+ 	for (i = 0; i < 13; i++)
+ 	{
+-	    if (rank[0]->w > cardLabelWidth)
+-		cardLabelWidth = rank[0]->w;
+-	    if (rank[0]->h > cardLabelHeight)
+-		cardLabelHeight = rank[0]->h;
++	    if (rank[0]->w() > cardLabelWidth)
++		cardLabelWidth = rank[0]->w();
++	    if (rank[0]->h() > cardLabelHeight)
++		cardLabelHeight = rank[0]->h();
+ 	}
+ 	for (i = 0; i < 4; i++)
+ 	{
+-	    if (suit[0]->w > cardLabelWidth)
+-		cardLabelWidth = suit[0]->w;
+-	    if (suit[0]->h > cardLabelHeight)
+-		cardLabelHeight = suit[0]->h;
++	    if (suit[0]->w() > cardLabelWidth)
++		cardLabelWidth = suit[0]->w();
++	    if (suit[0]->h() > cardLabelHeight)
++		cardLabelHeight = suit[0]->h();
+ 	}
+     }
+     else
diff --git a/packages/ipatience/ipatience_0.1.bb b/packages/ipatience/ipatience_0.1.bb
new file mode 100644
index 0000000000..b223437b19
--- /dev/null
+++ b/packages/ipatience/ipatience_0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Patience game"
+LICENSE = "GPL"
+SECTION = "x11"
+PRIORITY = "optional"
+DEPENDS = "virtual/libx11 xft libxtst libxpm fltk"
+PR = "r0"
+
+SRC_URI = "cvs://anoncvs@keithp.com/local/src/CVS;method=pserver;module=ipatience \
+          file://fix-make.patch;patch=1"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools
+
-- 
cgit v1.2.3


From acc1d6fe532d4a6114b1a19ec57612fcd96eb311 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 12 Nov 2006 14:16:35 +0000
Subject: jpeg: fix packaging * due to some bugs in shlib renaming we can't add
 RREPLACES, so packagers beware

---
 packages/jpeg/jpeg_6b.bb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index 659a5147bb..342197c8ad 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -1,11 +1,12 @@
-PR = "r4"
+DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
+LICENSE ="jpeg"
 SECTION = "libs"
 PRIORITY = "required"
+
 DEPENDS = "libtool-cross"
-DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
-PACKAGES += "jpeg-tools "
-FILES_jpeg-tools = "${bindir}/*"
-LICENSE ="jpeg"
+
+PR = "r5"
+
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://debian.patch;patch=1 \
 	   file://ldflags.patch;patch=1 \
@@ -33,3 +34,8 @@ do_install() {
 		   ${D}${mandir}/man1 ${D}${libdir}
 	oe_runmake 'DESTDIR=${D}' install
 }
+
+PACKAGES =+ 		"jpeg-tools "
+FILES_jpeg-tools = 	"${bindir}/*"
+
+
-- 
cgit v1.2.3


From dc9467d468da27147ab771ea336328b90c23ca86 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Sun, 12 Nov 2006 15:04:53 +0000
Subject: initscripts: checkroot.sh: chvt 1 if fsck returns with an errorcode
 and waits for user input. Fixes the "hanging" bootsplash on some distros

---
 packages/initscripts/initscripts-1.0/checkroot.sh | 6 ++++++
 packages/initscripts/initscripts_1.0.bb           | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/initscripts/initscripts-1.0/checkroot.sh b/packages/initscripts/initscripts-1.0/checkroot.sh
index e84e000f53..df3035371b 100755
--- a/packages/initscripts/initscripts-1.0/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/checkroot.sh
@@ -150,6 +150,12 @@ else
     #
     if test "$?" -gt 1
     then
+    
+      # Since this script is run very early in the boot-process, it should be safe to assume that the
+      # output is printed to VT1. However, some distributions use a bootsplash to hide the "ugly" boot
+      # messages and having the bootsplash "hang" due to a waiting fsck prompt is less than ideal
+      chvt 1
+    
       # Surprise! Re-directing from a HERE document (as in
       # "cat << EOF") won't work, because the root is read-only.
       echo
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 3c937856ae..73c02e5ec5 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r80"
+PR = "r81"
 
 SRC_URI = "file://halt \
            file://ramdisk \
-- 
cgit v1.2.3


From c68faff043f75e8f9d58cc28bf96e2892b93cd85 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Sun, 12 Nov 2006 15:19:58 +0000
Subject: altboot: Make Mr. Parser happy again

---
 packages/altboot/altboot_0.0.0.bb     | 6 +++---
 packages/altboot/altboot_1.0.8.bb     | 6 +++---
 packages/altboot/altboot_1.1.0-wip.bb | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'packages')

diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index ed14234d21..875f6c554b 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -20,14 +20,14 @@ RDEPENDS_${PN} = "${PN}-conf"
 
 ######################################################################################
 
-PR = "r48"
+PR = "r49"
 
 ######################################################################################
 
 PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
 
-PACKAGE_ARCH_${PN} = all
-PACKAGE_ARCH_${PN}-doc = all
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN}-doc = "all"
 PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb
index 58b6a9052a..4c214796d7 100644
--- a/packages/altboot/altboot_1.0.8.bb
+++ b/packages/altboot/altboot_1.0.8.bb
@@ -22,14 +22,14 @@ RDEPENDS_${PN}-conf = "${PN}"
 
 ######################################################################################
 
-PR = "r0"
+PR = "r1"
 
 ######################################################################################
 
 PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
 
-PACKAGE_ARCH_${PN} = all
-PACKAGE_ARCH_${PN}-doc = all
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN}-doc = "all"
 PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
diff --git a/packages/altboot/altboot_1.1.0-wip.bb b/packages/altboot/altboot_1.1.0-wip.bb
index 84acba9f32..df9ac5abfb 100644
--- a/packages/altboot/altboot_1.1.0-wip.bb
+++ b/packages/altboot/altboot_1.1.0-wip.bb
@@ -24,14 +24,14 @@ RDEPENDS_${PN}-conf = "${PN}"
 ######################################################################################
 
 WIP_DATE = "20061108"
-PR = "${WIP_DATE}-r0"
+PR = "${WIP_DATE}-r1"
 
 ######################################################################################
 
 PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
 
-PACKAGE_ARCH_${PN} = all
-PACKAGE_ARCH_${PN}-doc = all
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_${PN}-doc = "all"
 PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
 
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
-- 
cgit v1.2.3


From aed3e30c272f4867ba111e2a58342addeb14b1f2 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 13 Nov 2006 10:54:41 +0000
Subject: COMPATIBLE_MACHINE=nslu2: various packages updated

---
 packages/busybox/slingbox_1.00.bb                              |  9 ++-------
 packages/busybox/slingbox_1.1.3.bb                             |  9 ++-------
 packages/busybox/slingbox_1.2.2.bb                             |  9 ++-------
 packages/images/unslung-image.bb                               | 10 ++--------
 packages/linux/unslung-kernel_2.4.22.l2.3r63.bb                |  3 +--
 packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb    |  8 ++------
 packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb        |  8 ++------
 packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb     |  8 ++------
 .../nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb   |  8 ++------
 packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb            | 10 ++--------
 packages/upslug/upslug-native_1.0.bb                           | 10 ++--------
 packages/upslug/upslug-native_cvs.bb                           | 10 ++--------
 12 files changed, 23 insertions(+), 79 deletions(-)

(limited to 'packages')

diff --git a/packages/busybox/slingbox_1.00.bb b/packages/busybox/slingbox_1.00.bb
index 8e11a09e6c..2d2d88317c 100644
--- a/packages/busybox/slingbox_1.00.bb
+++ b/packages/busybox/slingbox_1.00.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r9"
+PR = "r10"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -13,12 +14,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 
 S = "${WORKDIR}/busybox-${PV}"
 
-python () {
-	# Don't build slingbox unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("switchbox only builds for the Linksys NSLU2")
-}
-
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 
diff --git a/packages/busybox/slingbox_1.1.3.bb b/packages/busybox/slingbox_1.1.3.bb
index 8cd85ce540..2a86748f28 100644
--- a/packages/busybox/slingbox_1.1.3.bb
+++ b/packages/busybox/slingbox_1.1.3.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -15,12 +16,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 
 S = "${WORKDIR}/busybox-${PV}"
 
-python () {
-	# Don't build slingbox unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2")
-}
-
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 
diff --git a/packages/busybox/slingbox_1.2.2.bb b/packages/busybox/slingbox_1.2.2.bb
index 56d75f943e..523e2199f5 100644
--- a/packages/busybox/slingbox_1.2.2.bb
+++ b/packages/busybox/slingbox_1.2.2.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r3"
+PR = "r4"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
@@ -17,12 +18,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 
 S = "${WORKDIR}/busybox-${PV}"
 
-python () {
-	# Don't build slingbox unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("slingbox only builds for the Linksys NSLU2")
-}
-
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 
diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index 82ca8313fd..3fa3607e83 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,5 +1,6 @@
 LICENSE = MIT
-PR = "r24"
+PR = "r25"
+COMPATIBLE_MACHINE = "nslu2"
 
 IMAGE_BASENAME = "unslung"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
@@ -119,10 +120,3 @@ unslung_clean_image () {
 #	#### End of Hack!
 
 }
-
-python () {
-	# Don't build unslung images 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")
-}
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 fd8afd1090..348fccf44b 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,4 +1,5 @@
 SECTION = "kernel"
+COMPATIBLE_MACHINE = "nslu2"
 
 require nslu2-linksys-kernel_2.4.22.bb
 
@@ -27,5 +28,3 @@ SRC_URI += "file://linux-kernel-R25_to_R29.patch;patch=1 \
 	    ${UNSLUNG_KERNEL_EXTRA_SRC_URI}"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-kernel', '${FILE_DIRNAME}/nslu2-linksys-kernel-2.4.22', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
index b8db38d3db..6d13d092c1 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-firmware_2.3r63.bb
@@ -2,16 +2,12 @@ SECTION = "base"
 PACKAGES = ""
 LICENSE = "GPL"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://nslu.sf.net/downloads/${PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${PN}-${PV}"
 
-python () {
-	# Don't build unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("NSLU2 firmware only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
 
 do_compile () {
 	install -d ${STAGING_LIBDIR}/nslu2-binaries
diff --git a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
index 4424e99d19..86b0a575eb 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Libraries."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
@@ -16,8 +16,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "/lib"
 
-python () {
-	# Don't build unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("NSLU2 stock firmware libraries only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
index 007b19cbb2..b098ba73ff 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-ramdisk_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Ramdisk."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
@@ -13,8 +13,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "/"
 
-python () {
-	# Don't build unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("NSLU2 ramdisk only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
index 4aace52412..44ef8aa1c9 100644
--- a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
+++ b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linksys NSLU2 Stock Firmware Samba Code Pages."
 PACKAGE_ARCH = "nslu2"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2"
 
@@ -22,8 +22,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "/etc/samba/codepages"
 
-python () {
-	# Don't build unless we're targeting an nslu2
-	if bb.data.getVar("MACHINE", d, 1) != "nslu2":
-		raise bb.parse.SkipPackage("NSLU2 stock firmware Samba code pages only builds for the Linksys NSLU2")
-}
+COMPATIBLE_MACHINE = "nslu2"
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index 290d2debbc..f6b65aad2a 100644
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,6 +1,7 @@
 SECTION = "base"
+COMPATIBLE_MACHINE = "nslu2"
 
-PR = "r16"
+PR = "r17"
 
 DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages"
 
@@ -58,13 +59,6 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \
 
 S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63"
 
-python () {
-	# Don't build unslung images 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")
-}
-
 do_compile () {
 	echo "V2.3R63-uNSLUng-${DISTRO_VERSION}" > ${S}/.unslung
 
diff --git a/packages/upslug/upslug-native_1.0.bb b/packages/upslug/upslug-native_1.0.bb
index 0249cb56fd..729f176a75 100644
--- a/packages/upslug/upslug-native_1.0.bb
+++ b/packages/upslug/upslug-native_1.0.bb
@@ -1,11 +1,12 @@
 # This package builds the 'upslug' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_TAG = "UPSLUG_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
 SRC_URI = "cvs://anonymous@nslu.cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug;tag=${SRC_TAG}"
@@ -25,10 +26,3 @@ do_compile() {
 do_stage() {
 	oe_runmake "DESTDIR=${STAGING_BINDIR}" install
 }
-
-python () {
-	# Don't build upslug unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	if mach != 'nslu2':
-		raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2")
-}
diff --git a/packages/upslug/upslug-native_cvs.bb b/packages/upslug/upslug-native_cvs.bb
index 7099b3ba44..95b340c589 100644
--- a/packages/upslug/upslug-native_cvs.bb
+++ b/packages/upslug/upslug-native_cvs.bb
@@ -1,11 +1,12 @@
 # This package builds the 'upslug' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL-2"
+COMPATIBLE_MACHINE = "nslu2"
 
 # Use releases in preference
 DEFAULT_PREFERENCE = "-1"
@@ -24,10 +25,3 @@ do_compile() {
 do_stage() {
 	oe_runmake "DESTDIR=${STAGING_BINDIR}" install
 }
-
-python () {
-	# Don't build upslug unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	if mach != 'nslu2':
-		raise bb.parse.SkipPackage("upslug only builds for the Linksys NSLU2")
-}
-- 
cgit v1.2.3


From c365e2b6a2f63c002aa11c255ebcb90ef22a7d38 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 13 Nov 2006 10:59:44 +0000
Subject: portmap-unslung: Set COMPATIBLE_MACHINE=nslu2

---
 packages/portmap/portmap-unslung_5-7.bb | 3 ++-
 packages/portmap/portmap-unslung_5-9.bb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/portmap/portmap-unslung_5-7.bb b/packages/portmap/portmap-unslung_5-7.bb
index 6ce7c3eab5..ee6c648e9b 100644
--- a/packages/portmap/portmap-unslung_5-7.bb
+++ b/packages/portmap/portmap-unslung_5-7.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
 	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb
index 6ce7c3eab5..ee6c648e9b 100644
--- a/packages/portmap/portmap-unslung_5-9.bb
+++ b/packages/portmap/portmap-unslung_5-9.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
+COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
 	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
-- 
cgit v1.2.3


From f8353737b039b8470a75280ecc36d9446322955f Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 13 Nov 2006 11:59:00 +0000
Subject: gmailfs: dropped - OE lack python-fuse which it depend and there were
 few new versions upstream so it looks like no one care

---
 packages/fuse/gmailfs_0.6.bb | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 packages/fuse/gmailfs_0.6.bb

(limited to 'packages')

diff --git a/packages/fuse/gmailfs_0.6.bb b/packages/fuse/gmailfs_0.6.bb
deleted file mode 100644
index 8c659441b3..0000000000
--- a/packages/fuse/gmailfs_0.6.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "GmailFS provides a mountable Linux filesystem which uses your Gmail account as its storage medium."
-HOMEPAGE = "http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesystem.html"
-LICENSE = "GPL"
-
-DEPENDS = "fuse libgmail python-fuse"
-RDEPENDS = "fuse libgmail python-fuse python-unixadmin  python-lang python-textutils python-core"
-
-SRC_URI = "http://richard.jones.name/google-hacks/gmail-filesystem/gmailfs-0.6.tar.gz"
-
-
-do_install() {
-install -d ${D}${datadir}/gmailfs
-install -d ${D}${bindir}
-install -d ${D}${sysconfdir}
-
-install -m 755 ${S}/gmailfs.py ${D}${datadir}/gmailfs/
-install -m 755 ${S}/mount.gmailfs ${D}${bindir}
-install -m 644 ${S}/*.conf ${D}${sysconfdir}
-
-}
-
-- 
cgit v1.2.3


From f41d40a953c0a2861f5786f05cfdcd985e1a2e73 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 13 Nov 2006 12:20:25 +0000
Subject: libpcre-native: do not PROVIDE pcre

---
 packages/libpcre/libpcre-native_4.4.bb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'packages')

diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_4.4.bb
index 7be8ffd0ac..a1813423c0 100644
--- a/packages/libpcre/libpcre-native_4.4.bb
+++ b/packages/libpcre/libpcre-native_4.4.bb
@@ -2,3 +2,7 @@ SECTION = "unknown"
 require libpcre_${PV}.bb
 inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}"
+
+# NOTE: multiple providers are available (libpcre, libpcre-native);
+# NOTE: consider defining PREFERRED_PROVIDER_pcre
+PROVIDES = "" 
-- 
cgit v1.2.3


From 67a41ab0a8ddfd847b78e5b339d06c39f133cabb Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 13 Nov 2006 12:20:45 +0000
Subject: unslung: Set more COMPATIBLE_MACHINE entries

---
 packages/meta/unslung-binary-kernel-packages.bb | 3 ++-
 packages/meta/unslung-packages.bb               | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb
index dfe2ec029e..2b6d64c5e5 100644
--- a/packages/meta/unslung-binary-kernel-packages.bb
+++ b/packages/meta/unslung-binary-kernel-packages.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware"
 LICENSE = MIT
-PR = "r0"
+PR = "r1"
+COMPATIBLE_MACHINE = "nslu2"
 
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb
index 21a55ae957..9bd77ff746 100644
--- a/packages/meta/unslung-packages.bb
+++ b/packages/meta/unslung-packages.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Packages that are compatible with the Unslung firmware"
 LICENSE = MIT
-PR = "r3"
+PR = "r4"
+COMPATIBLE_MACHINE = "nslu2"
 
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
-- 
cgit v1.2.3


From 9e2a2c85397d007c2b3c635a1eb1b25d8e5554ad Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 13 Nov 2006 12:22:15 +0000
Subject: povray: DEPEND on zlib not on libz

---
 packages/povray/povray_3.6.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index c8d9220da6..12e0a043b3 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -4,7 +4,7 @@ SECTION = "console/graphics"
 #Make this a weak assigment to allow branding of the povray binary 
 LICENSE = "povray"
 
-DEPENDS = "virtual/libx11 libz jpeg libpng tiff"
+DEPENDS = "virtual/libx11 zlib jpeg libpng tiff"
 RDEPENDS = ""
 
 PR = "r1"
-- 
cgit v1.2.3


From eb4830d4108da533f03d0fcef79206b99e6e62e7 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 13 Nov 2006 12:25:58 +0000
Subject: task-essential-to-boot: removed, obsoleted by task-base

---
 packages/tasks/task-essential-parts.bb   | 63 --------------------------------
 packages/tasks/task-essential-to-boot.bb | 35 ------------------
 2 files changed, 98 deletions(-)
 delete mode 100644 packages/tasks/task-essential-parts.bb
 delete mode 100644 packages/tasks/task-essential-to-boot.bb

(limited to 'packages')

diff --git a/packages/tasks/task-essential-parts.bb b/packages/tasks/task-essential-parts.bb
deleted file mode 100644
index 82c11537f8..0000000000
--- a/packages/tasks/task-essential-parts.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-parts.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "Creates all task-essential-* tasks"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r1"
-
-######################################################################################
-
-PACKAGE_ARCH = "${MACHINE}"
-ALLOW_EMPTY = 1
-
-PACKAGES = "task-essential-irda task-essential-bluetooth task-essential-bluetooth-all \
-	    task-essential-sound task-essential-sd task-essential-wifi task-essential-wifi-all \
-	    task-essential-usbclient task-essential-usbhost task-essential-pcmcia \
-	    task-essential-userspace task-essential-serial"
-
-######################################################################################
-
-DISTRO_PCMCIA ?= ""
-
-DISTRO_SERIAL ?= ""
-DISTRO_IRDA ?= ""
-DISTRO_BLUETOOTH ?= ""
-DISTRO_SOUND ?= ""
-DISTRO_WIFI ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
-		wireless-tools wpa-supplicant-nossl"
-
-DISTRO_USBCLIENT ?= ""
-DISTRO_USBHOST ?= ""
-
-DISTRO_SD ?= ""
-
-DISTRO_USERSPACE ?= "ipkg keymaps"
-
-DISTRO_DEPENDS ?= "hostap-utils prism3-firmware prism3-support spectrum-fw hostap-conf orinoco-conf \
-		   ipkg keymaps altboot wireless-tools wpa-supplicant-nossl"
-
-######################################################################################
-
-RDEPENDS_task-essential-serial = "${KMODULES_SERIAL} ${MACHINE_MODUTILS} ${MACHINE_SERIAL} ${DISTRO_SERIAL}"
-RDEPENDS_task-essential-irda = "task-essential-serial ${KMODULES_IRDA} ${MACHINE_MODUTILS} ${MACHINE_IRDA} ${DISTRO_IRDA}"
-RDEPENDS_task-essential-bluetooth = "${KMODULES_BLUETOOTH} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_BLUETOOTH} "
-RDEPENDS_task-essential-bluetooth-all = "task-essential-bluetooth ${KMODULES_BLUETOOTH_DRIVER} ${DISTRO_BLUETOOTH}"
-RDEPENDS_task-essential-pcmcia = "${KMODULES_PCMCIA} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_PCMCIA} ${DISTRO_PCMCIA}"
-RDEPENDS_task-essential-sound = "${KMODULES_SOUND} ${MACHINE_MODUTILS} ${MACHINE_SOUND} ${DISTRO_SOUND}"
-RDEPENDS_task-essential-sd = "${KMODULES_SD} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_SD} ${DISTRO_SD}"
-RDEPENDS_task-essential-wifi = "${KMODULES_WIFI} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_WIFI}"
-RDEPENDS_task-essential-wifi-all = "task-essential-wifi ${KMODULES_WIFI_DRIVER} ${DISTRO_WIFI}"
-RDEPENDS_task-essential-usbclient = "${KMODULES_USBCLIENT} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBCLIENT} ${DISTRO_USBCLIENT}"
-RDEPENDS_task-essential-usbhost = "${KMODULES_USBHOST} ${MACHINE_MODUTILS} ${MACHINE_HOTPLUG} ${MACHINE_USBHOST} ${DISTRO_USBHOST}"
-RDEPENDS_task-essential-userspace = "${DISTRO_USERSPACE}"
-
-
-DEPENDS = "${MACHINE_DEPENDS} ${DISTRO_DEPENDS}"
diff --git a/packages/tasks/task-essential-to-boot.bb b/packages/tasks/task-essential-to-boot.bb
deleted file mode 100644
index 565823298a..0000000000
--- a/packages/tasks/task-essential-to-boot.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: task-essential-to-boot.bb
-# Date: 23-Apr-06
-
-DESCRIPTION = "This task includes everything to make a bootable image. And not a bit more."
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-######################################################################################
-
-ALLOW_EMPTY = 1
-PACKAGES = "${PN}"
-
-######################################################################################
-
-PV = "0.0.1"
-PR = "r0"
-
-######################################################################################
-
-CORE_EXTRA_D ?= ""
-CORE_EXTRA_RD ?= ""
-
-CORE_PACKAGES_D = "virtual/kernel base-files base-passwd-3.5.9 busybox initscripts \
-		   sysvinit tinylogin ${CORE_EXTRA_D}"
-
-CORE_PACKAGES_RD = "kernel base-files base-passwd busybox initscripts sysvinit \
-		    tinylogin ${CORE_EXTRA_RD}"
-
-######################################################################################		    
-		    
-DEPENDS = "${CORE_PACKAGES_D}"
-RDEPENDS = "${CORE_PACKAGES_RD}"
-- 
cgit v1.2.3


From 006eecf9769374d14c65103ef358119e115f1193 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 13 Nov 2006 12:29:51 +0000
Subject: upslug2: Set COMPATIBLE_MACHINE to nslu2

---
 packages/upslug/upslug2.inc | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'packages')

diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc
index 0a91bc3fd1..9bee027034 100644
--- a/packages/upslug/upslug2.inc
+++ b/packages/upslug/upslug2.inc
@@ -1,11 +1,12 @@
 # This package builds the 'upslug2' binary upload/flash tool
 # for the NSLU2.  It is not useful for anything else.
-PR = "r0"
+PR = "r1"
 DESCRIPTION = "NSLU2 binary upload tool (version 2)"
 HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "MIT"
+COMPATIBLE_MACHINE = "nslu2"
 
 # On Linux libpcap does not work.  Using libpcap is sub-optimal - it
 # is intended for packet capture not management of a new protocol
@@ -28,10 +29,3 @@ S = "${WORKDIR}/upslug2-${PV}"
 
 PACKAGES = "${PN}"
 EXTRA_OECONF += "${LIBPCAP_OECONF}"
-
-python () {
-	# Don't build upslug2 unless we're targeting an nslu2
-	mach = bb.data.getVar("MACHINE", d, 1)
-	if mach != 'nslu2':
-		raise bb.parse.SkipPackage("upslug2 only builds for the Linksys NSLU2")
-}
-- 
cgit v1.2.3


From b59f722c216b73598c4c5fd7504a94dd966410cb Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 13 Nov 2006 12:32:18 +0000
Subject: apex: now works for nslu2

---
 packages/apex/apex_1.4.5.bb   | 45 ------------------------------------------
 packages/apex/apex_1.4.7.bb   | 46 +++++++++++++++++++++++++++++++++++++++++++
 packages/apex/nslu2/defconfig | 13 +++++++-----
 3 files changed, 54 insertions(+), 50 deletions(-)
 delete mode 100644 packages/apex/apex_1.4.5.bb
 create mode 100644 packages/apex/apex_1.4.7.bb

(limited to 'packages')

diff --git a/packages/apex/apex_1.4.5.bb b/packages/apex/apex_1.4.5.bb
deleted file mode 100644
index 35d772aa0b..0000000000
--- a/packages/apex/apex_1.4.5.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "APEX Boot Loader"
-SECTION = ""
-PRIORITY = "optional"
-HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
-	   file://defconfig"
-
-EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
-
-oe_runmake() {
-	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
-	make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
-}
-
-# FIXME - make this the same as the distro kernel compilation
-CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug"
-
-# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head
-# of the .config file and remove any settings in defconfig then append
-# defconfig to .config
-do_configure() {
-	rm -f ${S}/.config
-	echo "CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config'
-	if test '${ARCH_BYTE_SEX}' = be
-	then
-		echo 'CONFIG_USER_BIGENDIAN=y' >>'${S}/.config'
-		echo 'CONFIG_BIGENDIAN=y' >>'${S}/.config'
-	else
-		echo 'CONFIG_USER_LITTLEENDIAN=y' >>'${S}/.config'
-		echo 'CONFIG_LITTLEENDIAN=y' >>'${S}/.config'
-	fi
-	sed -e '/CONFIG_USER_BIGENDIAN/d' -e '/CONFIG_USER_LITTLEENDIAN/d' \
-	    -e '/CONFIG_ENV_DEFAULT_CMDLINE/d' \
-		${S}/src/mach-ixp42x/debian-nslu2-arm_config >>${S}/.config
-	oe_runmake oldconfig
-}
-
-do_populate_staging() {
-	install -d ${STAGING_LOADER_DIR}
-	# FIXME - arch-arm should not be hard-coded
-	install -m 0755 src/arch-arm/rom/apex.bin ${STAGI