propagate from branch 'org.openembedded.dev' (head 3e8a1aa38ecbd1a04d0cc182d8d1809d71b51079)

            to branch 'org.openembedded.nslu2-linux' (head 0ea2fa311bb3dc015275b544c3a9a6a3ed97e5ec)

14 files changed, 69 insertions, 7 deletions

diff --git a/packages/ipkg/ipkg-native.inc b/packages/ipkg/ipkg-native.inc
new file mode 100644
index 0000000000..b52b7b5e20
--- /dev/null
+++ b/packages/ipkg/ipkg-native.inc
@@ -0,0 +1,12 @@
+# NOTE: ipkg now obeys ${libdir}, so ipkg-native now installs
+# things into the wrong location inside of offline_root.  Backup
+# the target libdir and use that.
+target_libdir := "${libdir}"
+
+inherit native
+
+EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg"
+
+DEPENDS = "libtool-native automake-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
+PROVIDES = ""
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc
new file mode 100644
index 0000000000..f535cfbef0
--- /dev/null
+++ b/packages/ipkg/ipkg.inc
@@ -0,0 +1,51 @@
+DESCRIPTION = "Itsy Package Manager"
+DESCRIPTION_libipkg = "Itsy Package Manager Library"
+SECTION = "base"
+LICENSE = "GPL"
+PROVIDES = "virtual/ipkg libipkg"
+
+PACKAGES =+ "libipkg-dev libipkg"
+FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libipkg = "${libdir}"
+AUTO_LIBNAME_PKGS = "libipkg"
+
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+	file://terse.patch;patch=1"
+
+S = "${WORKDIR}/ipkg/C"
+
+inherit autotools pkgconfig
+
+pkg_postinst_ipkg () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+	# this happens at S98 where our good 'ole packages script used to run
+	echo -e "#!/bin/sh
+ipkg-cl configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+fi
+
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
+}
+
+pkg_postrm_ipkg () {
+#!/bin/sh
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
+}
+
+do_stage() {
+	oe_libinstall -so libipkg ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/replace/
+	install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
+	install -d ${STAGING_INCDIR}/libipkg/
+	for f in *.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+	done
+}
+
+#
+# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf
+#
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch
index 85d07191b9..85d07191b9 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0
index b993f2ac26..b993f2ac26 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie
index 9f51b61169..9f51b61169 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6
index 8b41380784..8b41380784 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle
index 42a851dd5f..42a851dd5f 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz
index ed5010d5c8..ed5010d5c8 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa
index c7eba4a337..c7eba4a337 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch
index a2dbce3325..a2dbce3325 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch
index ee761b75ad..ee761b75ad 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb
index 4f764c7803..2c7042c7ca 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r2"
+PR = "r0"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -23,10 +23,9 @@ BASRC = "http://www.orca.cx/zaurus/patches"
 # Patches submitted upstream are towards top of this list 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \
-           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm1/2.6.13-rc3-mm1.bz2;patch=1 \
-           ${RPSRC}/nand_softlockup-r0.patch;patch=1 \
-           ${RPSRC}/oprofile_irqfix-r0.patch;patch=1 \
-           ${RPSRC}/preempt_nwfpe-r1.patch;patch=1 \
+           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/2.6.13-rc3-mm3.bz2;patch=1 \
+           ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \
+           ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \
            ${RPSRC}/oprofile_typo-r0.patch;patch=1 \
            ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \
            ${RPSRC}/w100_core-r1.patch;patch=1 \
@@ -52,7 +51,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \
            ${RPSRC}/spitz_mtd-r0.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_bl-r0.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
            ${RPSRC}/ipaq/pxa_keys-r1.patch;patch=1 \
            ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \
@@ -70,7 +69,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/tosa-udc-r3.patch;patch=1 \
            ${DOSRC}/tosa-irda-r2.patch;patch=1 \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
-           ${DOSRC}/tosa-bl-r4.patch;patch=1 \
+           ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
            ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://add-elpp-stuff.patch;patch=1 \