Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/12/09 17:43:02+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/12/09 17:41:51+00:00 nexus.co.uk!pb
bump PR on gpe-appmgr

2004/12/09 17:20:21+00:00 nexus.co.uk!pb
also rename /sbin/depmod to depmod.26

BKrev: 41b894b2ZRdI1FMEcLLCgrWF424feQ

diff --git a/packages/gpe-appmgr/gpe-appmgr_2.4.bb b/packages/gpe-appmgr/gpe-appmgr_2.4.bb
index e69de29..78e97e7 100644 (file)
--- a/packages/gpe-appmgr/gpe-appmgr_2.4.bb
+++ b/packages/gpe-appmgr/gpe-appmgr_2.4.bb
@@ -0,0 +1,11 @@
+SECTION = "gpe"
+DESCRIPTION = "GPE application launcher"
+DEPENDS = "libgpewidget libgpelaunch"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+PR = "r1"
+
+inherit gpe
+
+SRC_URI += "file://groups.patch;patch=1"
+

diff --git a/packages/module-init-tools/module-init-tools_3.1-pre5.bb b/packages/module-init-tools/module-init-tools_3.1-pre5.bb
index e69de29..6259cf3 100644 (file)
--- a/packages/module-init-tools/module-init-tools_3.1-pre5.bb
+++ b/packages/module-init-tools/module-init-tools_3.1-pre5.bb
@@ -0,0 +1,47 @@
+licenSE = GPL
+SECTION = "base"
+DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
+removing kernel modules for Linux (versions 2.5.48 and above). It serves \
+the same function that the modutils package serves for Linux 2.4."
+PR = "r3"
+
+PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
+RDEPENDS_${PN} += "module-init-tools-depmod"
+
+FILES_module-init-tools-depmod = "${sbindir}/depmod"
+FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
+       file://backwards.patch;patch=1"
+S = "${WORKDIR}/module-init-tools-${PV}"
+
+bindir = "/bin"
+sbindir = "/sbin"
+
+inherit autotools
+
+do_install() {
+       autotools_do_install
+       for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
+               mv ${D}/$f ${D}/$f.26
+       done
+       install -d ${D}${mandir}
+       mv ${D}${prefix}/man/* ${D}${mandir}/
+}
+
+pkg_postinst_module-init-tools() {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
+bn=`basename $f`
+   update-alternatives --install /$f $bn /$f.26 20
+done
+}
+
+pkg_prerm_module-init-tools() {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
+bn=`basename $f`
+   update-alternatives --remove $bn /$f.26
+done
+}
+