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

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

2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.

2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass.  Thanks to Jordan Crouse for reporting.

2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.

2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references.  As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.

2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.

BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg

5 files changed, 61 insertions, 9 deletions

diff --git a/packages/ipkg/ipkg_0.99.129.bb b/packages/ipkg/ipkg_0.99.129.bb
index 4bb025c487..dcf513d81f 100644
--- a/packages/ipkg/ipkg_0.99.129.bb
+++ b/packages/ipkg/ipkg_0.99.129.bb
@@ -29,12 +29,12 @@ ipkg-cl configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
-update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
 pkg_postrm_ipkg () {
 #!/bin/sh
-update-alternatives --remove ipkg /usr/bin/ipkg-cl
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
 do_stage() {
diff --git a/packages/ipkg/ipkg_0.99.130.bb b/packages/ipkg/ipkg_0.99.130.bb
index a270c48fa6..6431a61ccf 100644
--- a/packages/ipkg/ipkg_0.99.130.bb
+++ b/packages/ipkg/ipkg_0.99.130.bb
@@ -29,12 +29,12 @@ ipkg-cl configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
-update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
 pkg_postrm_ipkg () {
 #!/bin/sh
-update-alternatives --remove ipkg /usr/bin/ipkg-cl
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
 do_stage() {
diff --git a/packages/ipkg/ipkg_0.99.135.bb b/packages/ipkg/ipkg_0.99.135.bb
index 4e948a7a42..0c1fc69ee6 100644
--- a/packages/ipkg/ipkg_0.99.135.bb
+++ b/packages/ipkg/ipkg_0.99.135.bb
@@ -32,12 +32,12 @@ ipkg-cl configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
-update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
 pkg_postrm_ipkg () {
 #!/bin/sh
-update-alternatives --remove ipkg /usr/bin/ipkg-cl
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
 do_stage() {
diff --git a/packages/ipkg/ipkg_0.99.138.bb b/packages/ipkg/ipkg_0.99.138.bb
index e69de29bb2..70bb45d7a7 100644
--- a/packages/ipkg/ipkg_0.99.138.bb
+++ b/packages/ipkg/ipkg_0.99.138.bb
@@ -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 = "${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/ipkg/ipkg_0.99.140.bb b/packages/ipkg/ipkg_0.99.140.bb
index aae1780823..1a6bb08317 100644
--- a/packages/ipkg/ipkg_0.99.140.bb
+++ b/packages/ipkg/ipkg_0.99.140.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Itsy Package Manager"
 DESCRIPTION_libipkg = "Itsy Package Manager Library"
 LICENSE = "GPL"
 PROVIDES = "virtual/ipkg libipkg"
-PR = "r0"
+PR = "r2"
 
 PACKAGES =+ "libipkg-dev libipkg"
 FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
@@ -29,12 +29,12 @@ ipkg-cl configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
-update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
 }
 
 pkg_postrm_ipkg () {
 #!/bin/sh
-update-alternatives --remove ipkg /usr/bin/ipkg-cl
+update-alternatives --remove ipkg ${bindir}/ipkg-cl
 }
 
 do_stage() {