simplify ipkg(-native) structure

merged all common code into ipkg.inc and ipkg-native.inc

22 files changed, 29 insertions, 684 deletions

diff --git a/packages/ipkg/ipkg-native_0.99.129.bb b/packages/ipkg/ipkg-native_0.99.129.bb
index e3bfb26cbc..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.129.bb
+++ b/packages/ipkg/ipkg-native_0.99.129.bb
@@ -1,7 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-inherit native
-
-DEPENDS = "libtool-native automake-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
-PROVIDES = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.130.bb b/packages/ipkg/ipkg-native_0.99.130.bb
index e3bfb26cbc..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.130.bb
+++ b/packages/ipkg/ipkg-native_0.99.130.bb
@@ -1,7 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-inherit native
-
-DEPENDS = "libtool-native automake-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
-PROVIDES = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.135.bb b/packages/ipkg/ipkg-native_0.99.135.bb
index e3bfb26cbc..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.135.bb
+++ b/packages/ipkg/ipkg-native_0.99.135.bb
@@ -1,7 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-inherit native
-
-DEPENDS = "libtool-native automake-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
-PROVIDES = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.138.bb b/packages/ipkg/ipkg-native_0.99.138.bb
index e3bfb26cbc..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.138.bb
+++ b/packages/ipkg/ipkg-native_0.99.138.bb
@@ -1,7 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-inherit native
-
-DEPENDS = "libtool-native automake-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
-PROVIDES = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.140.bb b/packages/ipkg/ipkg-native_0.99.140.bb
index e3bfb26cbc..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.140.bb
+++ b/packages/ipkg/ipkg-native_0.99.140.bb
@@ -1,7 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-inherit native
-
-DEPENDS = "libtool-native automake-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
-PROVIDES = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.144.bb b/packages/ipkg/ipkg-native_0.99.144.bb
index ad5d41db4e..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.144.bb
+++ b/packages/ipkg/ipkg-native_0.99.144.bb
@@ -1,15 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-
-# 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 = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.146.bb b/packages/ipkg/ipkg-native_0.99.146.bb
index 2652f931ea..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.146.bb
+++ b/packages/ipkg/ipkg-native_0.99.146.bb
@@ -1,16 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-
-# 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}"
-DEFAULT_PREFERENCE="-1"
-
-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 = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.147.bb b/packages/ipkg/ipkg-native_0.99.147.bb
index ad5d41db4e..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.147.bb
+++ b/packages/ipkg/ipkg-native_0.99.147.bb
@@ -1,15 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-
-# 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 = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.148.bb b/packages/ipkg/ipkg-native_0.99.148.bb
index ad5d41db4e..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.148.bb
+++ b/packages/ipkg/ipkg-native_0.99.148.bb
@@ -1,15 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-
-# 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 = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.151.bb b/packages/ipkg/ipkg-native_0.99.151.bb
index 3011b32b75..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.151.bb
+++ b/packages/ipkg/ipkg-native_0.99.151.bb
@@ -1,13 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-
-# 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
-
-DEPENDS = "libtool-native automake-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
-PROVIDES = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg-native_0.99.152.bb b/packages/ipkg/ipkg-native_0.99.152.bb
index 3011b32b75..d59eab3a61 100644
--- a/packages/ipkg/ipkg-native_0.99.152.bb
+++ b/packages/ipkg/ipkg-native_0.99.152.bb
@@ -1,13 +1,2 @@
-SECTION = "base"
 include ipkg_${PV}.bb
-
-# 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
-
-DEPENDS = "libtool-native automake-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
-PROVIDES = ""
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg_0.99.129.bb b/packages/ipkg/ipkg_0.99.129.bb
index dcf513d81f..35d096739b 100644
--- a/packages/ipkg/ipkg_0.99.129.bb
+++ b/packages/ipkg/ipkg_0.99.129.bb
@@ -1,53 +1,7 @@
-SECTION = "base"
-DESCRIPTION = "Itsy Package Manager"
-DESCRIPTION_libipkg = "Itsy Package Manager Library"
-LICENSE = "GPL"
-PROVIDES = "virtual/ipkg libipkg"
+include ipkg.inc
 PR = "r5"
 
-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://buffer-overflow.patch;patch=1 \
 	file://uninclude-replace.patch;patch=1 \
 	file://uclibc.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/ipkg/ipkg_0.99.130.bb b/packages/ipkg/ipkg_0.99.130.bb
index 6431a61ccf..8d646be408 100644
--- a/packages/ipkg/ipkg_0.99.130.bb
+++ b/packages/ipkg/ipkg_0.99.130.bb
@@ -1,53 +1,5 @@
-SECTION = "base"
-DESCRIPTION = "Itsy Package Manager"
-DESCRIPTION_libipkg = "Itsy Package Manager Library"
-LICENSE = "GPL"
-PROVIDES = "virtual/ipkg libipkg"
-PR = "r2"
+include ipkg.inc
+PR = "r5"
 
-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://uninclude-replace.patch;patch=1 \
-	file://terse.patch;patch=1 \
+SRC_URI += "file://uninclude-replace.patch;patch=1 \
 	file://uclibc.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/ipkg/ipkg_0.99.135.bb b/packages/ipkg/ipkg_0.99.135.bb
index 0c1fc69ee6..9a05a1ed05 100644
--- a/packages/ipkg/ipkg_0.99.135.bb
+++ b/packages/ipkg/ipkg_0.99.135.bb
@@ -1,56 +1,6 @@
-SECTION = "base"
-DESCRIPTION = "Itsy Package Manager"
-DESCRIPTION_libipkg = "Itsy Package Manager Library"
-LICENSE = "GPL"
-PROVIDES = "virtual/ipkg libipkg"
+include ipkg.inc
 PR = "r2"
-
-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://depends.patch;patch=1 \
+SRC_URI += "file://depends.patch;patch=1 \
 	file://uninclude-replace.patch;patch=1 \
-	file://terse.patch;patch=1 \
 	file://remove-c99isms.patch;patch=1 \
 	file://uclibc.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/ipkg/ipkg_0.99.138.bb b/packages/ipkg/ipkg_0.99.138.bb
index 70bb45d7a7..1898c6656e 100644
--- a/packages/ipkg/ipkg_0.99.138.bb
+++ b/packages/ipkg/ipkg_0.99.138.bb
@@ -1,52 +1 @@
-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 = "${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
-#
+include ipkg.inc
diff --git a/packages/ipkg/ipkg_0.99.140.bb b/packages/ipkg/ipkg_0.99.140.bb
index 1a6bb08317..88bf4a5ac1 100644
--- a/packages/ipkg/ipkg_0.99.140.bb
+++ b/packages/ipkg/ipkg_0.99.140.bb
@@ -1,53 +1,4 @@
-SECTION = "base"
-DESCRIPTION = "Itsy Package Manager"
-DESCRIPTION_libipkg = "Itsy Package Manager Library"
-LICENSE = "GPL"
-PROVIDES = "virtual/ipkg libipkg"
+include ipkg.inc
 PR = "r2"
 
-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 \
-	file://remove-c99isms.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
-#
+SRC_URI += "file://remove-c99isms.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.144.bb b/packages/ipkg/ipkg_0.99.144.bb
index 0cf93c0401..ff3da77a22 100644
--- a/packages/ipkg/ipkg_0.99.144.bb
+++ b/packages/ipkg/ipkg_0.99.144.bb
@@ -1,53 +1,3 @@
-SECTION = "base"
-DESCRIPTION = "Itsy Package Manager"
-DESCRIPTION_libipkg = "Itsy Package Manager Library"
-LICENSE = "GPL"
-PROVIDES = "virtual/ipkg libipkg"
+include ipkg.inc
 PR = "r2"
-
-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://paths.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 ${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
-#
+SRC_URI += "file://paths.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.146.bb b/packages/ipkg/ipkg_0.99.146.bb
index 4841ded663..1898c6656e 100644
--- a/packages/ipkg/ipkg_0.99.146.bb
+++ b/packages/ipkg/ipkg_0.99.146.bb
@@ -1,54 +1 @@
-SECTION = "base"
-DESCRIPTION = "Itsy Package Manager"
-DESCRIPTION_libipkg = "Itsy Package Manager Library"
-LICENSE = "GPL"
-PROVIDES = "virtual/ipkg libipkg"
-PR = "r2"
-
-DEFAULT_PREFERENCE="-1"
-
-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
-#
+include ipkg.inc
diff --git a/packages/ipkg/ipkg_0.99.147.bb b/packages/ipkg/ipkg_0.99.147.bb
index 89ac089bef..778fa86042 100644
--- a/packages/ipkg/ipkg_0.99.147.bb
+++ b/packages/ipkg/ipkg_0.99.147.bb
@@ -1,53 +1,2 @@
-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 = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-	file://terse.patch;patch=1 \
-	file://libdir.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
-#
+include ipkg.inc
+SRC_URI += "file://libdir.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.148.bb b/packages/ipkg/ipkg_0.99.148.bb
index 797e6a070b..778fa86042 100644
--- a/packages/ipkg/ipkg_0.99.148.bb
+++ b/packages/ipkg/ipkg_0.99.148.bb
@@ -1,53 +1,2 @@
-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 = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-	file://terse.patch;patch=1 \
-	file://libdir.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
-#
+include ipkg.inc
+SRC_URI += "file://libdir.patch;patch=1"
diff --git a/packages/ipkg/ipkg_0.99.151.bb b/packages/ipkg/ipkg_0.99.151.bb
index 684ff784b3..1898c6656e 100644
--- a/packages/ipkg/ipkg_0.99.151.bb
+++ b/packages/ipkg/ipkg_0.99.151.bb
@@ -1,54 +1 @@
-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 = "${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
-
-EXTRA_OECONF += "--with-ipkglibdir=/usr/lib"
-
-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
-#
+include ipkg.inc
diff --git a/packages/ipkg/ipkg_0.99.152.bb b/packages/ipkg/ipkg_0.99.152.bb
index 684ff784b3..1898c6656e 100644
--- a/packages/ipkg/ipkg_0.99.152.bb
+++ b/packages/ipkg/ipkg_0.99.152.bb
@@ -1,54 +1 @@
-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 = "${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
-
-EXTRA_OECONF += "--with-ipkglibdir=/usr/lib"
-
-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
-#
+include ipkg.inc