mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updates from OE

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky@170 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2005-11-04 12:04:54 +00:00
parent 46b6d82b5c
commit 925c447a51
17 changed files with 334 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
openembedded/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory → openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory
View File

14
openembedded/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt → openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt
View File

@@ -1,7 +1,7 @@
Index: module-init-tools-3.1/configure.in
Index: module-init-tools-3.2-pre9/configure.in
===================================================================
--- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500
+++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500
--- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000
+++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000
@@ -41,5 +41,14 @@
fi])
AC_SUBST(MODULE_DIR)
@@ -18,8 +18,10 @@ Index: module-init-tools-3.1/configure.in
+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
+AC_OUTPUT([Makefile])
--- module-init-tools-3.2-pre7/Makefile.am.orig 2005-07-05 13:55:06.000000000 +0200
+++ module-init-tools-3.2-pre7/Makefile.am 2005-07-05 13:55:31.000000000 +0200
Index: module-init-tools-3.2-pre9/Makefile.am
===================================================================
--- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000
+++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000
@@ -21,13 +21,14 @@
MAN5 = modprobe.conf.5 modules.dep.5
MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
@@ -28,7 +30,7 @@ Index: module-init-tools-3.1/configure.in
# If they haven't overridden mandir, fix it (never /man!)
mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
TESTSUITE := $(shell find tests -type f ! -name '*~')
TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions
-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
+if MANPAGES

60
openembedded/packages/module-init-tools/module-init-tools_3.1.bb
View File

@@ -1,60 +0,0 @@
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 = "r2"
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
RDEPENDS_${PN} += "module-init-tools-depmod"
FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
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://ignore_arch_directory;patch=1 \
file://modutils_extension;patch=1 \
file://no_man_rebuild;patch=1 \
file://manpagesopt;patch=1 \
file://soc.patch;patch=1;pnum=0"
S = "${WORKDIR}/module-init-tools-${PV}"
EXTRA_OECONF = "--disable-manpages"
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
}
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
}
pkg_postinst_module-init-tools-depmod() {
#!/bin/sh
update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
}
pkg_prerm_module-init-tools() {
#!/bin/sh
update-alternatives --remove depmod /sbin/depmod.26
}

6
openembedded/packages/module-init-tools/module-init-tools_3.2-pre7.bb → openembedded/packages/module-init-tools/module-init-tools_3.2-pre9.bb
View File

@@ -3,7 +3,7 @@ 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."
LICENSE = "GPL"
SECTION = "base"
PR = "r1"
PR = "r0"
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
RDEPENDS_${PN} += "module-init-tools-depmod"
@@ -36,7 +36,7 @@ pkg_postinst_module-init-tools() {
#!/bin/sh
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
bn=`basename $f`
update-alternatives --install /$f $bn /$f.26 20
update-alternatives --install /$f $bn /$f.26 60
done
update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
@@ -54,7 +54,7 @@ update-alternatives --remove lsmod /bin/lsmod.26
pkg_postinst_module-init-tools-depmod() {
#!/bin/sh
update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
}
pkg_prerm_module-init-tools() {