7 files changed, 148 insertions, 1 deletions
diff --git a/ipkg/ipkg-collateral.oe b/ipkg/ipkg-collateral.oe
index e69de29bb2..e5ffc687a1 100644
--- a/ipkg/ipkg-collateral.oe
+++ b/ipkg/ipkg-collateral.oe
@@ -0,0 +1,19 @@
+SECTION = "base"
+DESCRIPTION = "ipkg configuration files"
+
+SRC_URI = " \
+file://ipkg.conf.comments	\
+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
+}
+
+do_install () {
+	install -d ${D}/${sysconfdir}/
+	install -m 0644 ${WORKDIR}/ipkg.conf ${D}/${sysconfdir}/ipkg.conf
+}
diff --git a/ipkg/ipkg-native_0.99.127.oe b/ipkg/ipkg-native_0.99.127.oe
index e69de29bb2..1c5a11529d 100644
--- a/ipkg/ipkg-native_0.99.127.oe
+++ b/ipkg/ipkg-native_0.99.127.oe
@@ -0,0 +1,7 @@
+SECTION = "base"
+include ipkg_${PV}.oe
+inherit native
+
+DEPENDS = "patcher-native libtool-native automake-native"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/ipkg-${PV}"
+PROVIDES = ""
diff --git a/ipkg/ipkg-native_0.99.129.oe b/ipkg/ipkg-native_0.99.129.oe
index e69de29bb2..1c5a11529d 100644
--- a/ipkg/ipkg-native_0.99.129.oe
+++ b/ipkg/ipkg-native_0.99.129.oe
@@ -0,0 +1,7 @@
+SECTION = "base"
+include ipkg_${PV}.oe
+inherit native
+
+DEPENDS = "patcher-native libtool-native automake-native"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/ipkg-${PV}"
+PROVIDES = ""
diff --git a/ipkg/ipkg-native_0.99.130.oe b/ipkg/ipkg-native_0.99.130.oe
index e69de29bb2..1c5a11529d 100644
--- a/ipkg/ipkg-native_0.99.130.oe
+++ b/ipkg/ipkg-native_0.99.130.oe
@@ -0,0 +1,7 @@
+SECTION = "base"
+include ipkg_${PV}.oe
+inherit native
+
+DEPENDS = "patcher-native libtool-native automake-native"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/ipkg-${PV}"
+PROVIDES = ""
diff --git a/ipkg/ipkg_0.99.127.oe b/ipkg/ipkg_0.99.127.oe
index e69de29bb2..0db4463544 100644
--- a/ipkg/ipkg_0.99.127.oe
+++ b/ipkg/ipkg_0.99.127.oe
@@ -0,0 +1,52 @@
+SECTION = "base"
+DESCRIPTION = "Itsy Package Manager"
+DESCRIPTION_libipkg = "Itsy Package Manager Library"
+LICENSE = "GPL"
+PROVIDES = "virtual/ipkg libipkg"
+PR = "r0"
+
+PACKAGES =+ "libipkg-dev libipkg "
+FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libipkg = "${libdir}"
+AUTO_LIBNAME_PKGS = "libipkg"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+	file://uninclude-replace.patch;patch=1 \
+	file://depends.patch;patch=1"
+S = "${WORKDIR}/ipkg/C"
+
+inherit autotools 
+
+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
+rm -f \$0" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+fi
+
+update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+}
+
+pkg_postrm_ipkg () {
+#!/bin/sh
+update-alternatives --remove ipkg /usr/bin/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/ipkg/ipkg_0.99.129.oe b/ipkg/ipkg_0.99.129.oe
index 1959c0ce8f..6acaa36100 100644
--- a/ipkg/ipkg_0.99.129.oe
+++ b/ipkg/ipkg_0.99.129.oe
@@ -1,3 +1,4 @@
+SECTION = "base"
 DESCRIPTION = "Itsy Package Manager"
 DESCRIPTION_libipkg = "Itsy Package Manager Library"
 LICENSE = "GPL"
@@ -21,7 +22,9 @@ pkg_postinst_ipkg () {
 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\nipkg-cl configure\n" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+	echo -e "#!/bin/sh
+ipkg-cl configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
diff --git a/ipkg/ipkg_0.99.130.oe b/ipkg/ipkg_0.99.130.oe
index e69de29bb2..101328c8a4 100644
--- a/ipkg/ipkg_0.99.130.oe
+++ b/ipkg/ipkg_0.99.130.oe
@@ -0,0 +1,52 @@
+SECTION = "base"
+DESCRIPTION = "Itsy Package Manager"
+DESCRIPTION_libipkg = "Itsy Package Manager Library"
+LICENSE = "GPL"
+PROVIDES = "virtual/ipkg libipkg"
+PR = "r1"
+
+PACKAGES =+ "libipkg-dev libipkg"
+FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libipkg = "${libdir}"
+AUTO_LIBNAME_PKGS = "libipkg"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+	file://uninclude-replace.patch;patch=1 \
+	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 /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+}
+
+pkg_postrm_ipkg () {
+#!/bin/sh
+update-alternatives --remove ipkg /usr/bin/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
+#