summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2005-03-06 16:27:37 +0000
committerMatthias Hentges <oe@hentges.net>2005-03-06 16:27:37 +0000
commitf2b3c1e6b45830c9c669beab001c50ef90bb4ca9 (patch)
tree00959f026cbc7236d95fdf1934cbba890f4cc48d
parentf16aec7c01e7a344c72460c8d35ed73f3318dcac (diff)
Adjust ipkg-link to recent OZ / OE changes. Beagle users please test
BKrev: 422b2f79lE6IOywAjE-suC91-qrTkQ
-rw-r--r--packages/ipkg-utils/files/ipkg-link-oe.patch (renamed from packages/ipkg-utils/files/fix-ipkg-link-beagle.patch)0
-rw-r--r--packages/ipkg-utils/ipkg-link_1.6cvs.bb7
-rw-r--r--packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb2
-rw-r--r--packages/ipkg-utils/ipkg-utils_1.6cvs.bb7
4 files changed, 9 insertions, 7 deletions
diff --git a/packages/ipkg-utils/files/fix-ipkg-link-beagle.patch b/packages/ipkg-utils/files/ipkg-link-oe.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/ipkg-utils/files/fix-ipkg-link-beagle.patch
+++ b/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 1b46a35c3c..14d69dc7e9 100644
--- 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 a4bd93c319..2506dbab62 100644
--- 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 5327f012eb..4a1ba11008 100644
--- 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"