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 --- modutils/modutils-collateral.bb | 0 modutils/modutils-collateral.oe | 15 ------- modutils/modutils-cross_2.4.27.bb | 0 modutils/modutils-cross_2.4.27.oe | 26 ------------ modutils/modutils-initscripts.bb | 0 modutils/modutils-initscripts.oe | 18 -------- modutils/modutils_2.4.27.bb | 0 modutils/modutils_2.4.27.oe | 87 --------------------------------------- 8 files changed, 146 deletions(-) create mode 100644 modutils/modutils-collateral.bb delete mode 100644 modutils/modutils-collateral.oe create mode 100644 modutils/modutils-cross_2.4.27.bb delete mode 100644 modutils/modutils-cross_2.4.27.oe create mode 100644 modutils/modutils-initscripts.bb delete mode 100644 modutils/modutils-initscripts.oe create mode 100644 modutils/modutils_2.4.27.bb delete mode 100644 modutils/modutils_2.4.27.oe (limited to 'modutils') diff --git a/modutils/modutils-collateral.bb b/modutils/modutils-collateral.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modutils/modutils-collateral.oe b/modutils/modutils-collateral.oe deleted file mode 100644 index e40dced6b6..0000000000 --- a/modutils/modutils-collateral.oe +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "base" -DESCRIPTION = "modutils configuration files" -PR = "r2" - -SRC_URI = "file://modules \ - file://modules.conf" - -do_compile () { -} - -do_install () { - install -d ${D}/${sysconfdir} - install -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules - install -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf -} diff --git a/modutils/modutils-cross_2.4.27.bb b/modutils/modutils-cross_2.4.27.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modutils/modutils-cross_2.4.27.oe b/modutils/modutils-cross_2.4.27.oe deleted file mode 100644 index 5157ac4132..0000000000 --- a/modutils/modutils-cross_2.4.27.oe +++ /dev/null @@ -1,26 +0,0 @@ -SECTION = "base" -include modutils_${PV}.oe -PR = "r5" -inherit cross -S = "${WORKDIR}/modutils-${PV}" -DEPENDS = "patcher-native" -PACKAGES = "" -PROVIDES += "virtual/${TARGET_PREFIX}depmod" -DEFAULT_PREFERENCE = "1" - -SRC_URI += "file://modutils-cross/module.h.diff;patch=1" - -sbindir = "${prefix}/bin" - -EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" - -CFLAGS_prepend_mipsel = "-D__MIPSEL__" -CFLAGS_prepend_mipseb = "-D__MIPSEB__" - -do_stage () { - oe_runmake install -} - -do_install () { - : -} diff --git a/modutils/modutils-initscripts.bb b/modutils/modutils-initscripts.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modutils/modutils-initscripts.oe b/modutils/modutils-initscripts.oe deleted file mode 100644 index 5dde4203b1..0000000000 --- a/modutils/modutils-initscripts.oe +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "base" -DESCRIPTION = "modutils configuration files" -LICENSE = "PD" -SRC_URI = "file://modutils.sh" -PR = "r1" - -INITSCRIPT_NAME = "modutils.sh" -INITSCRIPT_PARAMS = "start 20 S ." - -inherit update-rc.d - -do_compile () { -} - -do_install () { - install -d ${D}/etc/init.d/ - install -m 0755 ${WORKDIR}/modutils.sh ${D}/etc/init.d/ -} diff --git a/modutils/modutils_2.4.27.bb b/modutils/modutils_2.4.27.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modutils/modutils_2.4.27.oe b/modutils/modutils_2.4.27.oe deleted file mode 100644 index e1cafca976..0000000000 --- a/modutils/modutils_2.4.27.oe +++ /dev/null @@ -1,87 +0,0 @@ -SECTION = "base" -DESCRIPTION = "These utilities are intended to make a Linux modular kernel \ -manageable for all users, administrators and distribution maintainers." -LICENSE = "GPLv2" -FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/files" -PR = "r5" - -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${PV}.tar.bz2 \ - file://lex.l.diff;patch=1 \ - file://modutils-notest.patch;patch=1 \ - file://configure.patch;patch=1 \ - file://program_prefix.patch;patch=1 \ - file://armeb.patch;patch=1" - -inherit autotools - -# modutils go in /sbin -sbindir = "/sbin" -EXTRA_OECONF = "--disable-strip" -export BUILDCC = "${BUILD_CC}" -export BUILDCFLAGS = "${BUILD_CFLAGS}" - -do_install () { - oe_runmake 'DESTDIR=${D}' install - install -d ${D}/${sysconfdir} - rm ${D}/sbin/lsmod - install -d ${D}/bin/ - ln -s ../sbin/insmod ${D}/bin/lsmod - for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo; do mv ${D}/$f ${D}/$f.24 - done -} - -pkg_postinst_modutils () { -#!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod bin/lsmod; do - bn=`basename $f` - update-alternatives --install /$f $bn /$f.24 10 -done -if test -n "$D"; then - D="-r $D" - if test -n "`which ${TARGET_PREFIX}depmod`"; then - for kerneldir in `ls -p ${IMAGE_ROOTFS}/lib/modules|grep /`; do - kernelver=`basename $kerneldir` - ${TARGET_PREFIX}depmod -a -b ${IMAGE_ROOTFS} -C ${IMAGE_ROOTFS}/${sysconfdir}/modules.conf -r $kernelver - done - fi -fi -update-rc.d $D modutils.sh start 20 S . -} - -pkg_prerm_modutils () { -#!/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.24 -done -if test -n "$D"; then - D="-r $D" -fi -update-rc.d $D modutils.sh remove -} - -pkg_postinst_modutils-depmod() { -#!/bin/sh -update-alternatives --install /sbin/depmod depmod /sbin/depmod.24 10 -} - -pkg_postinst_modutils-modinfo() { -#!/bin/sh -update-alternatives --install /sbin/modinfo modinfo /sbin/modinfo.24 10 -} - -pkg_prerm_modutils-depmod() { -#!/bin/sh -update-alternatives --remove depmod /sbin/depmod.24 -} - -pkg_prerm_modutils-modinfo() { -#!/bin/sh -update-alternatives --remove modinfo /sbin/modinfo.24 -} - -PACKAGES = "modutils-depmod modutils-modinfo modutils-doc modutils" - -FILES_modutils-depmod = "sbin/depmod.24" -FILES_modutils-modinfo = "sbin/modinfo.24" -RDEPENDS_modutils = "modutils-depmod" -- cgit v1.2.3