[oe-commits] org.oe.dev opkg: sync with poky, based on patches from http://blog.haerwu.biz/download/diffs/opkg-poky/

[hrw commit]

opkg: sync with poky, based on patches from http://blog.haerwu.biz/download/diffs/opkg-poky/

Author: hrw at openedhand.com
Branch: org.openembedded.dev
Revision: 62c5986fc4d88b206843bf2fb69cd9f9b4679f9f
ViewMTN: http://monotone.openembedded.org/revision/info/62c5986fc4d88b206843bf2fb69cd9f9b4679f9f
Files:
1
packages/opkg/opkg-collateral
packages/opkg/opkg-collateral/dest
packages/opkg/opkg-collateral/lists
packages/opkg/opkg-collateral/opkg.conf.comments
packages/opkg/opkg-collateral.bb
packages/opkg/opkg-sdk_svn.bb
packages/opkg/opkg.inc
packages/opkg/opkg-native_svn.bb
packages/opkg/opkg_svn.bb
Diffs:

#
# mt diff -rbed7cc7b23704d8f63b21365aa0538f4fdca1820 -r62c5986fc4d88b206843bf2fb69cd9f9b4679f9f
#
#
#
# add_dir "packages/opkg/opkg-collateral"
# 
# add_file "packages/opkg/opkg-collateral/dest"
#  content [5fde020e410dadc8dd05e5830f9b8ad78fdd93b8]
# 
# add_file "packages/opkg/opkg-collateral/lists"
#  content [0dceab9bed55dea67ca252345c42306482dd3dff]
# 
# add_file "packages/opkg/opkg-collateral/opkg.conf.comments"
#  content [83c1338cdf12c36089dd960f912a0ce4098d6a95]
# 
# add_file "packages/opkg/opkg-collateral.bb"
#  content [b8294141cfcae76c4862a252466983e4ad8242ba]
# 
# add_file "packages/opkg/opkg-sdk_svn.bb"
#  content [38e13d0db11312ba3b893f891d63aad2c68e1ed0]
# 
# add_file "packages/opkg/opkg.inc"
#  content [aedace2858631d4fe546f63c2d9af393d084cc49]
# 
# patch "packages/opkg/opkg-native_svn.bb"
#  from [245fd0e296a0ab95bb84cb651cb09b205e927d07]
#    to [e527ac2860974b35fe26ef814c8e63f878fe6187]
# 
# patch "packages/opkg/opkg_svn.bb"
#  from [e08f111c50f9d0c56d5ae1b3b8f42777af3e65dc]
#    to [1437c9d20a4c285cd41b72cab5fb7823cad37584]
#
============================================================
--- packages/opkg/opkg-collateral/dest	5fde020e410dadc8dd05e5830f9b8ad78fdd93b8
+++ packages/opkg/opkg-collateral/dest	5fde020e410dadc8dd05e5830f9b8ad78fdd93b8
@@ -0,0 +1 @@
+dest root /
============================================================
--- packages/opkg/opkg-collateral/lists	0dceab9bed55dea67ca252345c42306482dd3dff
+++ packages/opkg/opkg-collateral/lists	0dceab9bed55dea67ca252345c42306482dd3dff
@@ -0,0 +1,2 @@
+lists_dir ext /var/lib/opkg
+
============================================================
--- packages/opkg/opkg-collateral/opkg.conf.comments	83c1338cdf12c36089dd960f912a0ce4098d6a95
+++ packages/opkg/opkg-collateral/opkg.conf.comments	83c1338cdf12c36089dd960f912a0ce4098d6a95
@@ -0,0 +1,23 @@
+# Must have one or more source entries of the form:
+#
+#   src <src-name> <source-url>
+#
+# and one or more destination entries of the form:
+#
+#   dest <dest-name> <target-path>
+#
+# where <src-name> and <dest-names> are identifiers that
+# should match [a-zA-Z0-9._-]+, <source-url> should be a
+# URL that points to a directory containing a Familiar
+# Packages file, and <target-path> should be a directory
+# that exists on the target system.
+
+# Proxy Support
+#option http_proxy http://proxy.tld:3128
+#option ftp_proxy http://proxy.tld:3128
+#option proxy_username <username>
+#option proxy_password <password>
+
+# Offline mode (for use in constructing flash images offline)
+#option offline_root target
+
============================================================
--- packages/opkg/opkg-collateral.bb	b8294141cfcae76c4862a252466983e4ad8242ba
+++ packages/opkg/opkg-collateral.bb	b8294141cfcae76c4862a252466983e4ad8242ba
@@ -0,0 +1,22 @@
+DESCRIPTION = "opkg configuration files"
+SECTION = "base"
+LICENSE = "MIT"
+
+SRC_URI = "file://opkg.conf.comments \
+	   file://lists \
+	   file://dest \
+	   file://src "
+
+do_compile () {
+	cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf
+	cat ${WORKDIR}/src	>>${WORKDIR}/opkg.conf
+	cat ${WORKDIR}/dest	>>${WORKDIR}/opkg.conf
+	cat ${WORKDIR}/lists	>>${WORKDIR}/opkg.conf
+}
+
+do_install () {
+	install -d ${D}${sysconfdir}/
+	install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/opkg.conf"
============================================================
--- packages/opkg/opkg-sdk_svn.bb	38e13d0db11312ba3b893f891d63aad2c68e1ed0
+++ packages/opkg/opkg-sdk_svn.bb	38e13d0db11312ba3b893f891d63aad2c68e1ed0
@@ -0,0 +1,7 @@
+require opkg.inc
+
+DEPENDS = "curl-sdk"
+
+inherit sdk
+
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir}/opkg -disable-gpg"
============================================================
--- packages/opkg/opkg.inc	aedace2858631d4fe546f63c2d9af393d084cc49
+++ packages/opkg/opkg.inc	aedace2858631d4fe546f63c2d9af393d084cc49
@@ -0,0 +1,15 @@
+DESCRIPTION = "Open Package Manager"
+DESCRIPTION_libopkg = "Open Package Manager Library"
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "curl gpgme"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http"
+S = "${WORKDIR}/opkg"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- packages/opkg/opkg-native_svn.bb	245fd0e296a0ab95bb84cb651cb09b205e927d07
+++ packages/opkg/opkg-native_svn.bb	e527ac2860974b35fe26ef814c8e63f878fe6187
@@ -1,10 +1,10 @@
-require opkg_svn.bb
+require opkg.inc
 
 DEPENDS = "curl-native"
+PR = "r1"
 
 target_libdir := "${libdir}"
 
 inherit native
 
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir} -disable-gpg"
-EXTRA_OECONF += "--with-opkglibdir=${target_libdir}/opkg -disable-gpg"
-
============================================================
--- packages/opkg/opkg_svn.bb	e08f111c50f9d0c56d5ae1b3b8f42777af3e65dc
+++ packages/opkg/opkg_svn.bb	1437c9d20a4c285cd41b72cab5fb7823cad37584
@@ -1,21 +1,33 @@
-DESCRIPTION = "Open Package Manager"
-DESCRIPTION_libopkg = "Open Package Manager Library"
-SECTION = "base"
-LICENSE = "GPL"
-DEPENDS = "curl gpgme"
-PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+require opkg.inc
 
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http"
-S = "${WORKDIR}/opkg"
+PR = "r2"
 
-inherit autotools pkgconfig
+PACKAGES =+ "libopkg-dev libopkg"
 
-do_stage() {
-	autotools_stage_all
+FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libopkg = "${libdir}/*.so.*"
+
+# Define a variable to allow distros to run configure earlier.
+# (for example, to enable loading of ethernet kernel modules before networking starts)
+OPKG_INIT_POSITION = "98"
+OPKG_INIT_POSITION_slugos = "41"
+
+pkg_postinst_opkg () {
+#!/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 "#!/bin/sh
+opkg-cl configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
+	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
+fi
+
+update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
 }
 
-PACKAGES =+ "libopkg-dev libopkg"
+pkg_postrm_opkg () {
+#!/bin/sh
+update-alternatives --remove opkg ${bindir}/opkg-cl
+}
 
-FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libopkg = "${libdir}/*.so.*"