20 files changed, 190 insertions, 0 deletions

diff --git a/meta/packages/ipkg/files/terse.patch b/meta/packages/ipkg/files/terse.patch
new file mode 100644
index 0000000000..3c4d6bed7e
--- /dev/null
+++ b/meta/packages/ipkg/files/terse.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- C/ipkg_cmd.c~terse
++++ C/ipkg_cmd.c
+@@ -148,9 +146,7 @@
+        int result;
+        p_userdata = userdata;
+        result = (cmd->fun)(conf, argc, argv);
+-        if ( result == 0 ) {
+-           ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n");
+-        } else {
++        if ( result != 0 ) {
+            ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result);
+         }
+    
diff --git a/meta/packages/ipkg/files/uclibc.patch b/meta/packages/ipkg/files/uclibc.patch
new file mode 100644
index 0000000000..d0d3a3ff7c
--- /dev/null
+++ b/meta/packages/ipkg/files/uclibc.patch
@@ -0,0 +1,13 @@
+Index: C/libbb/libbb.h
+===================================================================
+--- C.orig/libbb/libbb.h        2003-02-24 10:31:52.000000000 -0500
++++ C/libbb/libbb.h     2005-01-20 03:07:10.031420944 -0500
+@@ -340,7 +340,7 @@
+ #define CONSOLE_DEV "/dev/console"
+ 
+ /* Cope with mmu-less systems somewhat gracefully */
+-#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__)
++#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__)
+ #define fork   vfork
+ #endif
+ 
diff --git a/meta/packages/ipkg/files/uninclude-replace.patch b/meta/packages/ipkg/files/uninclude-replace.patch
new file mode 100644
index 0000000000..a3ed2201fd
--- /dev/null
+++ b/meta/packages/ipkg/files/uninclude-replace.patch
@@ -0,0 +1,10 @@
+--- C/includes.h        2003-03-28 19:36:22.000000000 +0000
++++ C/includes.h        2004-07-28 03:41:11.000000000 +0100
+@@ -48,6 +48,6 @@
+ # include <unistd.h>
+ #endif
+ 
+-#include "replace/replace.h"
++//#include "replace/replace.h"
+ 
+ #endif
diff --git a/meta/packages/ipkg/ipkg-collateral.bb b/meta/packages/ipkg/ipkg-collateral.bb
new file mode 100644
index 0000000000..a4f7bb7e3a
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "ipkg configuration files"
+SECTION = "base"
+LICENSE = "MIT"
+PR = "r2"
+
+SRC_URI = " \
+file://ipkg.conf.comments       \
+file://lists \
+file://dest \
+file://src \
+"
+
+do_compile () {
+        cat ${WORKDIR}/ipkg.conf.comments >${WORKDIR}/ipkg.conf
+        cat ${WORKDIR}/src      >>${WORKDIR}/ipkg.conf
+        cat ${WORKDIR}/dest     >>${WORKDIR}/ipkg.conf
+        cat ${WORKDIR}/lists    >>${WORKDIR}/ipkg.conf
+}
+
+do_install () {
+        install -d ${D}${sysconfdir}/
+        install -m 0644 ${WORKDIR}/ipkg.conf ${D}${sysconfdir}/ipkg.conf
+}
diff --git a/meta/packages/ipkg/ipkg-collateral/akita/dest b/meta/packages/ipkg/ipkg-collateral/akita/dest
new file mode 100644
index 0000000000..647490d30a
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/akita/dest
@@ -0,0 +1,4 @@
+dest root /
+dest home /home/packages/
+dest cf /media/cf/packages/
+dest sd /media/card/packages/
diff --git a/meta/packages/ipkg/ipkg-collateral/akita/lists b/meta/packages/ipkg/ipkg-collateral/akita/lists
new file mode 100644
index 0000000000..cc776c595b
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/akita/lists
@@ -0,0 +1,4 @@
+
+# Uncomment to move ipkg server-data into RAM
+# lists_dir ext /var/lib/ipkg
+
diff --git a/meta/packages/ipkg/ipkg-collateral/collie/dest b/meta/packages/ipkg/ipkg-collateral/collie/dest
new file mode 100644
index 0000000000..c76101a5b2
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/collie/dest
@@ -0,0 +1,4 @@
+dest root /
+dest cf /media/cf/packages/
+dest sd /media/card/packages/
+dest ram /media/ram/packages/
diff --git a/meta/packages/ipkg/ipkg-collateral/dest b/meta/packages/ipkg/ipkg-collateral/dest
new file mode 100644
index 0000000000..088ca403da
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/dest
@@ -0,0 +1 @@
+dest root /
diff --git a/meta/packages/ipkg/ipkg-collateral/ipkg.conf.comments b/meta/packages/ipkg/ipkg-collateral/ipkg.conf.comments
new file mode 100644
index 0000000000..51623f4d53
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/ipkg.conf.comments
@@ -0,0 +1,23 @@
+# Must have one or more source entries of the form:
+#
+#   src <src-name> <source-url>
+#
+# and one or more destination entries of the form:
+#
+#   dest <dest-name> <target-path>
+#
+# where <src-name> and <dest-names> are identifiers that
+# should match [a-zA-Z0-9._-]+, <source-url> should be a
+# URL that points to a directory containing a Familiar
+# Packages file, and <target-path> should be a directory
+# that exists on the target system.
+
+# Proxy Support
+#option http_proxy http://proxy.tld:3128
+#option ftp_proxy http://proxy.tld:3128
+#option proxy_username <username>
+#option proxy_password <password>
+
+# Offline mode (for use in constructing flash images offline)
+#option offline_root target
+
diff --git a/meta/packages/ipkg/ipkg-collateral/jornada56x/dest b/meta/packages/ipkg/ipkg-collateral/jornada56x/dest
new file mode 100644
index 0000000000..154ce57587
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/jornada56x/dest
@@ -0,0 +1,4 @@
+dest root /
+dest cf /mnt/cf/packages/
+dest sd /mnt/card/packages/
+dest ram /mnt/ram/packages/
diff --git a/meta/packages/ipkg/ipkg-collateral/lists b/meta/packages/ipkg/ipkg-collateral/lists
new file mode 100644
index 0000000000..3c524f8c77
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/lists
@@ -0,0 +1,2 @@
+lists_dir ext /var/lib/ipkg
+
diff --git a/meta/packages/ipkg/ipkg-collateral/openmn/src b/meta/packages/ipkg/ipkg-collateral/openmn/src
new file mode 100644
index 0000000000..97cdd4741c
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/openmn/src
@@ -0,0 +1 @@
+src mnci54 http://www.mn-solutions.de/feed/mnci54/base
diff --git a/meta/packages/ipkg/ipkg-collateral/poodle/dest b/meta/packages/ipkg/ipkg-collateral/poodle/dest
new file mode 100644
index 0000000000..9379964e57
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/poodle/dest
@@ -0,0 +1,4 @@
+dest root /
+dest cf /media/cf/packages/
+dest sd /media/card/packages/
+dest home /home/packages/
diff --git a/meta/packages/ipkg/ipkg-collateral/simpad/dest b/meta/packages/ipkg/ipkg-collateral/simpad/dest
new file mode 100644
index 0000000000..20d03ba822
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/simpad/dest
@@ -0,0 +1,3 @@
+dest root /
+dest cf /mnt/cf/packages/
+dest ram /mnt/ram/packages/
diff --git a/meta/packages/ipkg/ipkg-collateral/src b/meta/packages/ipkg/ipkg-collateral/src
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/src
diff --git a/meta/packages/ipkg/ipkg-collateral/tosa/dest b/meta/packages/ipkg/ipkg-collateral/tosa/dest
new file mode 100644
index 0000000000..c76101a5b2
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-collateral/tosa/dest
@@ -0,0 +1,4 @@
+dest root /
+dest cf /media/cf/packages/
+dest sd /media/card/packages/
+dest ram /media/ram/packages/
diff --git a/meta/packages/ipkg/ipkg-native.inc b/meta/packages/ipkg/ipkg-native.inc
new file mode 100644
index 0000000000..b52b7b5e20
--- /dev/null
+++ b/meta/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/meta/packages/ipkg/ipkg-native_0.99.154.bb b/meta/packages/ipkg/ipkg-native_0.99.154.bb
new file mode 100644
index 0000000000..d59eab3a61
--- /dev/null
+++ b/meta/packages/ipkg/ipkg-native_0.99.154.bb
@@ -0,0 +1,2 @@
+include ipkg_${PV}.bb
+include ipkg-native.inc
diff --git a/meta/packages/ipkg/ipkg.inc b/meta/packages/ipkg/ipkg.inc
new file mode 100644
index 0000000000..8fc6c9efe0
--- /dev/null
+++ b/meta/packages/ipkg/ipkg.inc
@@ -0,0 +1,56 @@
+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
+
+# Define a variable to allow distros to run configure earlier.
+# (for example, to enable loading of ethernet kernel modules before networking starts)
+IPKG_INIT_POSITION = "98"
+IPKG_INIT_POSITION_slugos = "41"
+
+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/S${IPKG_INIT_POSITION}configure
+        chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
+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/meta/packages/ipkg/ipkg_0.99.154.bb b/meta/packages/ipkg/ipkg_0.99.154.bb
new file mode 100644
index 0000000000..de6af147b6
--- /dev/null
+++ b/meta/packages/ipkg/ipkg_0.99.154.bb
@@ -0,0 +1,2 @@
+include ipkg.inc
+PR = "r3"