From a780643c4b6aa11e1a36965a69df7116477c7b4c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 7 Dec 2004 22:05:47 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:packages.bb into handhelds.org:/home/kergoth/code/packages.bb 2004/12/07 04:58:25-06:00 ti.com!kergoth More updates per the core rename. 2004/12/07 04:46:51-06:00 ti.com!kergoth Update soundtracker per the core rename. 2004/12/07 04:44:14-06:00 ti.com!kergoth Merge 2004/12/07 04:42:38-06:00 ti.com!kergoth Updates per the recent rename of the oe core from 'oe' to 'bitbake'. BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw --- ipkg-utils/ipkg-link_1.6cvs.bb | 0 ipkg-utils/ipkg-link_1.6cvs.oe | 20 ------------------ ipkg-utils/ipkg-utils-native_1.6cvs.bb | 0 ipkg-utils/ipkg-utils-native_1.6cvs.oe | 11 ---------- ipkg-utils/ipkg-utils_1.6cvs.bb | 0 ipkg-utils/ipkg-utils_1.6cvs.oe | 37 ---------------------------------- 6 files changed, 68 deletions(-) create mode 100644 ipkg-utils/ipkg-link_1.6cvs.bb delete mode 100644 ipkg-utils/ipkg-link_1.6cvs.oe create mode 100644 ipkg-utils/ipkg-utils-native_1.6cvs.bb delete mode 100644 ipkg-utils/ipkg-utils-native_1.6cvs.oe create mode 100644 ipkg-utils/ipkg-utils_1.6cvs.bb delete mode 100644 ipkg-utils/ipkg-utils_1.6cvs.oe (limited to 'ipkg-utils') diff --git a/ipkg-utils/ipkg-link_1.6cvs.bb b/ipkg-utils/ipkg-link_1.6cvs.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ipkg-utils/ipkg-link_1.6cvs.oe b/ipkg-utils/ipkg-link_1.6cvs.oe deleted file mode 100644 index e6edd626ce..0000000000 --- a/ipkg-utils/ipkg-link_1.6cvs.oe +++ /dev/null @@ -1,20 +0,0 @@ -SECTION = "base" -DESCRIPTION = "Itsy Package Manager utilities link script" -LICENSE = "GPL" -CONFLICTS = "ipkg-utils" -PV_append = "${CVSDATE}" - -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" -S = "${WORKDIR}/ipkg-utils" - -do_compile() { - : -} - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ipkg-link ${D}/${bindir} -} diff --git a/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/ipkg-utils/ipkg-utils-native_1.6cvs.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ipkg-utils/ipkg-utils-native_1.6cvs.oe b/ipkg-utils/ipkg-utils-native_1.6cvs.oe deleted file mode 100644 index cacb8f3ba7..0000000000 --- a/ipkg-utils/ipkg-utils-native_1.6cvs.oe +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "base" -include ipkg-utils_${PV}.oe -PR = "r3" -inherit native -DEPENDS = "python-native" - -do_stage() { - for i in ${INSTALL}; do - install -m 0755 $i ${STAGING_BINDIR} - done -} diff --git a/ipkg-utils/ipkg-utils_1.6cvs.bb b/ipkg-utils/ipkg-utils_1.6cvs.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ipkg-utils/ipkg-utils_1.6cvs.oe b/ipkg-utils/ipkg-utils_1.6cvs.oe deleted file mode 100644 index 54656c772a..0000000000 --- a/ipkg-utils/ipkg-utils_1.6cvs.oe +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Itsy Package Manager utilities" -DEPENDS = "" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "Chris Larson " -LICENSE = "GPL" -CONFLICTS = "ipkg-link" -RDEPENDS = "python" -PV_append = "${CVSDATE}" -PR = "r5" - -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 " -S = "${WORKDIR}/ipkg-utils" - -INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py" - -do_compile() { - oe_runmake ipkg-compare-versions -} - -do_install() { - install -d ${D}${bindir} - for i in ${INSTALL} - do - install -m 0755 $i ${D}${bindir} - done -} - -#FIXME: ipkg-utils is not allowed to have packages or else a ipkg-native -> ipkg-utils -> ipkg-utils -# recursive dependency is triggered. This has been fixed by installing the ipkg-link script in -# a dedicated package. -#PACKAGES_prepend = "ipkg-link " -#FILES_ipkg-link = "${bindir}/ipkg-link" - -- cgit v1.2.3