r1635 - in trunk/oe/packages/ipkg: . ipkg-0.99.163
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Mon Apr 2 21:06:52 CEST 2007
Author: mickey
Date: 2007-04-02 21:06:52 +0200 (Mon, 02 Apr 2007)
New Revision: 1635
Added:
trunk/oe/packages/ipkg/ipkg-0.99.163/
trunk/oe/packages/ipkg/ipkg-0.99.163/patch-ipkg-localfilename
trunk/oe/packages/ipkg/ipkg-collateral.bb
trunk/oe/packages/ipkg/ipkg-native_0.99.163.bb
trunk/oe/packages/ipkg/ipkg_0.99.163.bb
Log:
oe: reintroduce our ipkg overlay to make the updated patch sitting in files/ effective
Added: trunk/oe/packages/ipkg/ipkg-0.99.163/patch-ipkg-localfilename
===================================================================
--- trunk/oe/packages/ipkg/ipkg-0.99.163/patch-ipkg-localfilename 2007-04-02 19:05:12 UTC (rev 1634)
+++ trunk/oe/packages/ipkg/ipkg-0.99.163/patch-ipkg-localfilename 2007-04-02 19:06:52 UTC (rev 1635)
@@ -0,0 +1,29 @@
+--- ipkg-0.99.163.orig/ipkg_download.c Thu Apr 20 20:18:29 2006
++++ ipkg-0.99.163/ipkg_download.c Thu Jan 18 05:54:52 2007
+@@ -108,6 +108,7 @@
+ {
+ int err;
+ char *url;
++ char *filename;
+
+ if (pkg->src == NULL) {
+ ipkg_message(conf,IPKG_ERROR, "ERROR: Package %s (parent %s) is not available from any configured src.\n",
+@@ -117,11 +118,16 @@
+
+ sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
+
+- /* XXX: BUG: The pkg->filename might be something like
++ /* The pkg->filename might be something like
+ "../../foo.ipk". While this is correct, and exactly what we
+ want to use to construct url above, here we actually need to
+ use just the filename part, without any directory. */
+- sprintf_alloc(&pkg->local_filename, "%s/%s", dir, pkg->filename);
++ filename = strrchr(pkg->filename, '/');
++ if(NULL == filename)
++ filename = pkg->filename;
++ else
++ filename++;
++ sprintf_alloc(&pkg->local_filename, "%s/%s", dir, filename);
+
+ err = ipkg_download(conf, url, pkg->local_filename);
+ free(url);
Added: trunk/oe/packages/ipkg/ipkg-collateral.bb
===================================================================
--- trunk/oe/packages/ipkg/ipkg-collateral.bb 2007-04-02 19:05:12 UTC (rev 1634)
+++ trunk/oe/packages/ipkg/ipkg-collateral.bb 2007-04-02 19:06:52 UTC (rev 1635)
@@ -0,0 +1,26 @@
+DESCRIPTION = "ipkg configuration files"
+SECTION = "base"
+LICENSE = "MIT"
+PR = "r5"
+PACKAGE_ARCH = "all"
+
+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
+}
+
+CONFFILES_${PN} = "${sysconfdir}/ipkg.conf"
Added: trunk/oe/packages/ipkg/ipkg-native_0.99.163.bb
===================================================================
--- trunk/oe/packages/ipkg/ipkg-native_0.99.163.bb 2007-04-02 19:05:12 UTC (rev 1634)
+++ trunk/oe/packages/ipkg/ipkg-native_0.99.163.bb 2007-04-02 19:06:52 UTC (rev 1635)
@@ -0,0 +1,10 @@
+S = "${WORKDIR}/ipkg-${PV}"
+
+#require ipkg_${PV}.bb
+require ipkg-native.inc
+PR = "r1"
+
+inherit autotools pkgconfig native
+
+SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz"
+
Added: trunk/oe/packages/ipkg/ipkg_0.99.163.bb
===================================================================
--- trunk/oe/packages/ipkg/ipkg_0.99.163.bb 2007-04-02 19:05:12 UTC (rev 1634)
+++ trunk/oe/packages/ipkg/ipkg_0.99.163.bb 2007-04-02 19:06:52 UTC (rev 1635)
@@ -0,0 +1,18 @@
+include ipkg.inc
+PR = "r3"
+
+S = "${WORKDIR}/ipkg-${PV}"
+
+SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
+ file://terse.patch;patch=1 \
+ file://is-processing.patch;patch=1"
+
+do_stage() {
+ oe_libinstall -so libipkg ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/libipkg/
+ for f in *.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+ done
+}
+
More information about the commitlog
mailing list