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

Update hdparm, initscripts (keymap), module-init-tools

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky@192 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2005-12-13 09:15:15 +00:00
parent 4946096015
commit 42406332d1
11 changed files with 82 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory vendored Normal file
View File

@@ -0,0 +1,24 @@
diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200
+++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200
@@ -31,6 +31,7 @@
\fI/etc/modprobe.conf\fR configuration file and
\fI/etc/modprobe.d\fR directory
(see \fBmodprobe.conf\fR(5)).
+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
.PP
Note that this version of \fBmodprobe\fR does not
do anything to the module itself: the work of resolving symbols
--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200
+++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200
@@ -1158,6 +1158,10 @@
DIR *dir;
int ret = 0;
+ /* ignore everything in this directory */
+ if (streq(filename, "/etc/modprobe.d/arch"))
+ return 1;
+
/* Reiser4 has file/directory duality: treat it as both. */
dir = opendir(filename);
if (dir) {

41
openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt vendored Normal file
View File

@@ -0,0 +1,41 @@
Index: module-init-tools-3.2-pre9/configure.in
===================================================================
--- 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)
-AC_OUTPUT([Makefile])
+AC_ARG_ENABLE(manpages,
+[ --disable-manpages Disable man page generation.],
+[if test x"$enableval" != x"no"; then
+ enable_manpages=yes
+else
+ enable_manpages=no
+fi],
+[enable_manpages=yes])
+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
+AC_OUTPUT([Makefile])
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
SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
-man_MANS = $(MAN5) $(MAN8)
# 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 '*~') tests/vg-suppressions
-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
+if MANPAGES
+man_MANS = $(MAN5) $(MAN8)
+endif
sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
bin_PROGRAMS = lsmod