From d11e3c73c059e033e0514ae90d29d5f9bf4f488e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 16 Jan 2006 11:51:45 +0000 Subject: ipkg-utils(-native), ipkg-link: fixed SRCDATE to 20050404 Last change in CVS was 20050330 but OpenZaurus 3.5.3 used 20050403 CVSDATE and we need to keep upgrades possible. --- packages/ipkg-utils/ipkg-link_1.6cvs.bb | 19 ------------ packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb | 18 ++++++++++++ packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb | 13 --------- .../ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb | 15 ++++++++++ packages/ipkg-utils/ipkg-utils_1.6cvs.bb | 34 ---------------------- packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb | 32 ++++++++++++++++++++ 6 files changed, 65 insertions(+), 66 deletions(-) delete mode 100644 packages/ipkg-utils/ipkg-link_1.6cvs.bb create mode 100644 packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb delete mode 100644 packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb create mode 100644 packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb delete mode 100644 packages/ipkg-utils/ipkg-utils_1.6cvs.bb create mode 100644 packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs.bb b/packages/ipkg-utils/ipkg-link_1.6cvs.bb deleted file mode 100644 index 94f749cf62..0000000000 --- a/packages/ipkg-utils/ipkg-link_1.6cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "base" -DESCRIPTION = "Itsy Package Manager utilities link script" -LICENSE = "GPL" -CONFLICTS = "ipkg-utils" -PV_append = "${SRCDATE}" -PR = "r1" - -SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" - -S = "${WORKDIR}/ipkg-utils" - -do_compile() { - : -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 ipkg-link ${D}${bindir} -} diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb b/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb new file mode 100644 index 0000000000..bcd3c7b1a0 --- /dev/null +++ b/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb @@ -0,0 +1,18 @@ +SECTION = "base" +DESCRIPTION = "Itsy Package Manager utilities link script" +LICENSE = "GPL" +CONFLICTS = "ipkg-utils" +PR = "r2" + +SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" + +S = "${WORKDIR}/ipkg-utils" + +do_compile() { + : +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 ipkg-link ${D}${bindir} +} diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb deleted file mode 100644 index cd24007f02..0000000000 --- a/packages/ipkg-utils/ipkg-utils-native_1.6cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "base" -include ipkg-utils_${PV}.bb -PR = "r4" -inherit native -RDEPENDS = "python-native" -# Avoid circular dependencies from package_ipk.bbclass -PACKAGES = "" - -do_stage() { - for i in ${INSTALL}; do - install -m 0755 $i ${STAGING_BINDIR} - done -} diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb new file mode 100644 index 0000000000..9c1ab32963 --- /dev/null +++ b/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb @@ -0,0 +1,15 @@ +include ipkg-utils_${PV}.bb + +RDEPENDS = "python-native" +PR = "r5" + +inherit native + +# Avoid circular dependencies from package_ipk.bbclass +PACKAGES = "" + +do_stage() { + for i in ${INSTALL}; do + install -m 0755 $i ${STAGING_BINDIR} + done +} diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb deleted file mode 100644 index e315c82264..0000000000 --- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Itsy Package Manager utilities" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "Chris Larson " -LICENSE = "GPL" -CONFLICTS = "ipkg-link" -RDEPENDS = "python" -PV_append = "${SRCDATE}" -PR = "r9" - -SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" - -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" - diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb new file mode 100644 index 0000000000..b0acd94954 --- /dev/null +++ b/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Itsy Package Manager utilities" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" +CONFLICTS = "ipkg-link" +RDEPENDS = "python" +PR = "r10" + +SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" + +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 From d33b1325a53496a321b3cdb8398ad1fa41a69422 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 16 Jan 2006 12:05:55 +0000 Subject: linux-hotplug 20040920: added patch which remove message about lack of PCI events - added as OpenZaurus specific now - I don't know how much machines with 2.4 and PCI exist in OE world. --- packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch | 11 +++++++++++ packages/linux-hotplug/linux-hotplug_20040920.bb | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch diff --git a/packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch b/packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch new file mode 100644 index 0000000000..5b4d169a2a --- /dev/null +++ b/packages/linux-hotplug/linux-hotplug-20040920/quiet-pci.patch @@ -0,0 +1,11 @@ +--- hotplug-2004_09_20/etc/hotplug/pci.rc.orig 2006-01-14 16:15:34.000000000 +0100 ++++ hotplug-2004_09_20/etc/hotplug/pci.rc 2006-01-14 16:16:19.000000000 +0100 +@@ -45,7 +45,7 @@ + # 2.4 kernels + LISTER=`which pcimodules` + if [ "$LISTER" = "" ] || [ ! -f /proc/bus/pci/devices ] || [ ! -x pci.agent ]; then +- echo $"** can't synthesize pci hotplug events" ++ # echo $"** can't synthesize pci hotplug events" + return 1 + fi + diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb index ce503a219e..c6bcbb66e6 100644 --- a/packages/linux-hotplug/linux-hotplug_20040920.bb +++ b/packages/linux-hotplug/linux-hotplug_20040920.bb @@ -8,7 +8,7 @@ RCONFLICTS_${PN} = "hotplug" RREPLACES_${PN} = "hotplug" SECTION = "base" RSUGGESTS = "pciutils usbutils" -PR = "r7" +PR = "r8" SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \ file://userspecified_hcd.patch;patch=1 \ @@ -27,7 +27,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_2 file://isapnp-exit.diff;patch=1 \ file://usb-storage \ file://soc.agent" - + +SRC_URI_append_openzaurus = " file://quiet-pci.patch;patch=1" + S = "${WORKDIR}/hotplug-2004_09_20" INITSCRIPT_NAME = "hotplug" -- cgit v1.2.3