[oe-commits] org.oe.dev merge of '0d8bbbcdb6668a128380d44dac827d05c8e25266'

[koen commit]

merge of '0d8bbbcdb6668a128380d44dac827d05c8e25266'
     and '56d99745e997218245cc7d9ec59717796070a9d6'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 84118ee2504fbe9e7a84b1cf20d20c519aee868c
ViewMTN: http://monotone.openembedded.org/revision/info/84118ee2504fbe9e7a84b1cf20d20c519aee868c
Files:
1
packages/upnp/libupnp_1.4.2.bb
packages/ushare/ushare_1.1a.bb
packages/opkg/opkg-ipkg-compat.bb
packages/angstrom/angstrom-feed-configs.bb
Diffs:

#
# mt diff -r0d8bbbcdb6668a128380d44dac827d05c8e25266 -r84118ee2504fbe9e7a84b1cf20d20c519aee868c
#
# 
# 
# add_file "packages/upnp/libupnp_1.4.2.bb"
#  content [5954835ded65c76dd5353b45114a58452af0e8c7]
# 
# add_file "packages/ushare/ushare_1.1a.bb"
#  content [bbb32d6dd91881d091868f8ac695e9f334a1bd22]
# 
============================================================
--- packages/upnp/libupnp_1.4.2.bb	5954835ded65c76dd5353b45114a58452af0e8c7
+++ packages/upnp/libupnp_1.4.2.bb	5954835ded65c76dd5353b45114a58452af0e8c7
@@ -0,0 +1,12 @@
+DESCRIPTION = "The portable SDK for UPnP* Devices (libupnp) provides developers with an API and open source code for building control points, devices, and bridges that are compliant with Version 1.0 of the Universal Plug and Play Device Architecture Specification."
+HOMEPAGE = "http://pupnp.sourceforge.net/"
+LICENSE = "BSD"
+
+LEAD_SONAME = "libupnp"
+SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${P}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- packages/ushare/ushare_1.1a.bb	bbb32d6dd91881d091868f8ac695e9f334a1bd22
+++ packages/ushare/ushare_1.1a.bb	bbb32d6dd91881d091868f8ac695e9f334a1bd22
@@ -0,0 +1,20 @@
+DESCRIPTION = "ushare is a UPnP media server"
+LICENSE = "GPL"
+HOMEPAGE = "http://ushare.geexbox.org/"
+DEPENDS = "libupnp virtual/libiconv virtual/libintl"
+SRC_URI = "http://ushare.geexbox.org/releases/ushare-${PV}.tar.bz2"
+S = "${WORKDIR}/ushare-${PV}"
+
+inherit autotools gettext
+
+# the configure script is hand-crafted, it rejects some of the usual
+# configure arguments
+do_configure () {
+	${S}/configure \
+		    --prefix=${prefix} \
+		    --bindir=${bindir} \
+		    --localedir=${datadir}/locale \
+		    --sysconfdir=${sysconfdir} \
+		    --cross-compile
+}
+


#
# mt diff -r56d99745e997218245cc7d9ec59717796070a9d6 -r84118ee2504fbe9e7a84b1cf20d20c519aee868c
#
# 
# 
# add_file "packages/opkg/opkg-ipkg-compat.bb"
#  content [f9bba36069b6fa8993aa13524c9e9242cb594108]
# 
# patch "packages/angstrom/angstrom-feed-configs.bb"
#  from [00be167d12290e5397a37b2c96241288c530a27b]
#    to [486fc4918f2c8a68142e81f078766cb17d1af82c]
# 
============================================================
--- packages/opkg/opkg-ipkg-compat.bb	f9bba36069b6fa8993aa13524c9e9242cb594108
+++ packages/opkg/opkg-ipkg-compat.bb	f9bba36069b6fa8993aa13524c9e9242cb594108
@@ -0,0 +1,19 @@
+DESCRIPTION = "Files to make opkg and ipkg coexist"
+RDEPENDS = "opkg ipkg ipkg-collateral"
+
+PR = "r0"
+PACKAGE_ARCH = "all"
+
+do_compile() {
+	:
+}
+
+
+do_install () {
+	install -d ${D}${sysconfdir}
+	install -d ${D}/var/lib/ipkg
+	ln -sf ${sysconfdir}/ipkg.conf ${D}${sysconfdir}/opkg.conf
+	ln -sf ${sysconfdir}/ipkg/ ${D}${sysconfdir}/opkg
+	ln -sf /var/lib/ipkg ${D}/var/lib/ipkg
+}
+
============================================================
--- packages/angstrom/angstrom-feed-configs.bb	00be167d12290e5397a37b2c96241288c530a27b
+++ packages/angstrom/angstrom-feed-configs.bb	486fc4918f2c8a68142e81f078766cb17d1af82c
@@ -1,7 +1,7 @@ DESCRIPTION = "Configuration files for o
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
 
 #PV = "${DISTRO_VERSION}"
-PR = "r3"
+PR = "r4"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FEED_BASEPATH ?= "unstable/feed/"
@@ -27,6 +27,11 @@ do_install () {
 do_install () {
         install -d ${D}${sysconfdir}/ipkg
 	install -m 0644  ${S}/${sysconfdir}/ipkg/* ${D}${sysconfdir}/ipkg/
+        # opkg compat symlinks
+        install -d ${D}${sysconfdir}/opkg
+        for feed in ${D}${sysconfdir}/ipkg/* ; do
+           ln -sf ${sysconfdir}/ipkg/$(basename $feed) ${D}${sysconfdir}/opkg/$(basename $feed)
+        done
 }
 
 CONFFILES_${PN} += "${sysconfdir}/ipkg/base-feed.conf \