Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/25 13:50:27-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/projects/oe/openembedded

2005/02/25 13:50:03-06:00 ti.com!kergoth
Apply patch to ipkg 0.99.144 to add a --with-ipkgdir configure option, then alter ipkg-native 0.99.144 to back up the target libdir before native is inherited, and pass that via the new configure option.

2005/02/25 19:44:49+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/02/25 13:11:56-06:00 ti.com!kergoth
Unbork the gcc-cross ipk file creation bits per the recent target path changes.

2005/02/25 19:44:33+01:00 (none)!koen
kbdd_cvs.bb:
  bump kbdd up to 0.8

2005/02/25 19:36:14+01:00 (none)!koen
fix imlib_1.2.0 src_uri imlib 1.2.0 != imlib2 CVS HEAD

2005/02/25 19:11:34+01:00 (none)!koen
add familiar-0.8.2.conf

BKrev: 421f8184dARKYVBLLD9NqXg-CD8pmA

3 files changed, 68 insertions, 0 deletions

diff --git a/packages/ipkg/ipkg-0.99.144/paths.patch b/packages/ipkg/ipkg-0.99.144/paths.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipkg/ipkg-0.99.144/paths.patch
diff --git a/packages/ipkg/ipkg-native_0.99.144.bb b/packages/ipkg/ipkg-native_0.99.144.bb
index e69de29bb2..ad5d41db4e 100644
--- a/packages/ipkg/ipkg-native_0.99.144.bb
+++ b/packages/ipkg/ipkg-native_0.99.144.bb
@@ -0,0 +1,15 @@
+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 = ""
diff --git a/packages/ipkg/ipkg_0.99.144.bb b/packages/ipkg/ipkg_0.99.144.bb
index e69de29bb2..2ddde751cb 100644
--- a/packages/ipkg/ipkg_0.99.144.bb
+++ b/packages/ipkg/ipkg_0.99.144.bb
@@ -0,0 +1,53 @@
+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://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
+#