Adjust ipkg-link to recent OZ / OE changes. Beagle users please test

BKrev: 422b2f79lE6IOywAjE-suC91-qrTkQ

diff --git a/packages/ipkg-utils/files/fix-ipkg-link-beagle.patch b/packages/ipkg-utils/files/ipkg-link-oe.patch
similarity index 100%
rename from packages/ipkg-utils/files/fix-ipkg-link-beagle.patch
rename to packages/ipkg-utils/files/ipkg-link-oe.patch

diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs.bb b/packages/ipkg-utils/ipkg-link_1.6cvs.bb
index 1b46a35..14d69dc 100644 (file)
--- a/packages/ipkg-utils/ipkg-link_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-link_1.6cvs.bb
@@ -3,11 +3,12 @@ DESCRIPTION = "Itsy Package Manager utilities link script"
 LICENSE = "GPL"
 CONFLICTS = "ipkg-utils"
 PV_append = "${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
-          file://fix-ipkg-link.patch;patch=1 "
-          
-SRC_URI_append_beagle = "file://fix-ipkg-link-beagle.patch;patch=1"       
+          file://fix-ipkg-link.patch;patch=1 \
+          file://ipkg-link-oe.patch;patch=1"
+                  
 S = "${WORKDIR}/ipkg-utils"
 
 do_compile() {

diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
index a4bd93c..2506dba 100644 (file)
--- a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 include ipkg-utils_${PV}.bb
-PR = "r3"
+PR = "r4"
 inherit native
 DEPENDS = ""
 

diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
index 5327f01..4a1ba11 100644 (file)
--- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
@@ -7,12 +7,13 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 PV_append = "${CVSDATE}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
           file://fix-ipkg-link.patch;patch=1 \
-          file://fix-ipkg-tar.patch;patch=1 "
-SRC_URI_append_beagle = " file://fix-ipkg-link-beagle.patch;patch=1 "     
+          file://fix-ipkg-tar.patch;patch=1 \
+          file://ipkg-link-oe.patch;patch=1"
+          
 S = "${WORKDIR}/ipkg-utils"
 
 INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py"