summaryrefslogtreecommitdiff
path: root/cleopatre/buildroot/package/module-init-tools
diff options
context:
space:
mode:
authorlefranc2008-08-01 09:25:43 +0000
committerlefranc2008-08-01 09:25:43 +0000
commit9a2bcc0b92b392f1f21cd26927515e4d49bc128e (patch)
treed0bd193c764606c4c6e4b4568ef08d0ff3324b72 /cleopatre/buildroot/package/module-init-tools
parentd0cc0304ed6eaf72116743e13e5b3b3cbfd878bb (diff)
- import of buildroot original sources (20080729 version)
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@2704 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/buildroot/package/module-init-tools')
-rw-r--r--cleopatre/buildroot/package/module-init-tools/Config.in9
-rw-r--r--cleopatre/buildroot/package/module-init-tools/module-init-tools-remove-index.patch12
-rw-r--r--cleopatre/buildroot/package/module-init-tools/module-init-tools.mk123
-rw-r--r--cleopatre/buildroot/package/module-init-tools/module-init-tools.patch77
4 files changed, 221 insertions, 0 deletions
diff --git a/cleopatre/buildroot/package/module-init-tools/Config.in b/cleopatre/buildroot/package/module-init-tools/Config.in
new file mode 100644
index 0000000000..bf9902d10c
--- /dev/null
+++ b/cleopatre/buildroot/package/module-init-tools/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_MODULE_INIT_TOOLS
+ bool "module-init-tools"
+ help
+ The module-init-tools 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.
+
+ http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/
diff --git a/cleopatre/buildroot/package/module-init-tools/module-init-tools-remove-index.patch b/cleopatre/buildroot/package/module-init-tools/module-init-tools-remove-index.patch
new file mode 100644
index 0000000000..1a2da28599
--- /dev/null
+++ b/cleopatre/buildroot/package/module-init-tools/module-init-tools-remove-index.patch
@@ -0,0 +1,12 @@
+diff -ur module-init-tools-3.2.2/modprobe.c module-init-tools-3.2.2-patched/modprobe.c
+--- module-init-tools-3.2.2/modprobe.c 2005-12-01 17:42:09.000000000 -0600
++++ module-init-tools-3.2.2-patched/modprobe.c 2006-12-04 19:50:50.353237649 -0600
+@@ -270,7 +270,7 @@
+ char *modname;
+
+ /* Ignore lines without : or which start with a # */
+- ptr = index(line, ':');
++ ptr = strchr(line, ':');
+ if (ptr == NULL || line[strspn(line, "\t ")] == '#')
+ return 0;
+
diff --git a/cleopatre/buildroot/package/module-init-tools/module-init-tools.mk b/cleopatre/buildroot/package/module-init-tools/module-init-tools.mk
new file mode 100644
index 0000000000..63d3af53f8
--- /dev/null
+++ b/cleopatre/buildroot/package/module-init-tools/module-init-tools.mk
@@ -0,0 +1,123 @@
+#############################################################
+#
+# module-init-tools
+#
+#############################################################
+MODULE_INIT_TOOLS_VERSION=3.2.2
+MODULE_INIT_TOOLS_SOURCE=module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
+MODULE_INIT_TOOLS_CAT:=$(BZCAT)
+MODULE_INIT_TOOLS_SITE=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/module-init-tools/
+MODULE_INIT_TOOLS_DIR=$(BUILD_DIR)/module-init-tools-$(MODULE_INIT_TOOLS_VERSION)
+MODULE_INIT_TOOLS_DIR2=$(TOOL_BUILD_DIR)/module-init-tools-$(MODULE_INIT_TOOLS_VERSION)
+MODULE_INIT_TOOLS_BINARY=depmod
+MODULE_INIT_TOOLS_TARGET_BINARY=$(TARGET_DIR)/sbin/$(MODULE_INIT_TOOLS_BINARY)
+
+STRIPPROG=$(STRIPCMD)
+
+$(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE):
+ $(WGET) -P $(DL_DIR) $(MODULE_INIT_TOOLS_SITE)/$(MODULE_INIT_TOOLS_SOURCE)
+
+$(MODULE_INIT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
+ $(MODULE_INIT_TOOLS_CAT) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ toolchain/patch-kernel.sh $(MODULE_INIT_TOOLS_DIR) package/module-init-tools \*.patch
+ $(CONFIG_UPDATE) $(MODULE_INIT_TOOLS_DIR)
+ touch $(MODULE_INIT_TOOLS_DIR)/.unpacked
+
+$(MODULE_INIT_TOOLS_DIR)/.configured: $(MODULE_INIT_TOOLS_DIR)/.unpacked
+ (cd $(MODULE_INIT_TOOLS_DIR); rm -f config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ INSTALL=$(MODULE_INIT_TOOLS_DIR)/install-sh \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/ \
+ --sysconfdir=/etc \
+ --program-transform-name='' \
+ )
+ touch $(MODULE_INIT_TOOLS_DIR)/.configured
+
+$(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY): $(MODULE_INIT_TOOLS_DIR)/.configured
+ $(MAKE) CC=$(TARGET_CC) -C $(MODULE_INIT_TOOLS_DIR)
+ touch -c $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY)
+
+ifeq ($(strip $(BR2_PACKAGE_MODUTILS)),y)
+$(MODULE_INIT_TOOLS_TARGET_BINARY): \
+ $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY) \
+ modutils
+else
+$(MODULE_INIT_TOOLS_TARGET_BINARY): \
+ $(MODULE_INIT_TOOLS_DIR)/$(MODULE_INIT_TOOLS_BINARY)
+endif
+ifeq ($(strip $(BR2_PACKAGE_MODUTILS)),y)
+ $(MAKE) prefix=$(TARGET_DIR) -C $(MODULE_INIT_TOOLS_DIR) moveold
+endif
+ STRIPPROG='$(STRIPPROG)' \
+ $(MAKE) prefix=$(TARGET_DIR) -C $(MODULE_INIT_TOOLS_DIR) install-exec
+ rm -Rf $(TARGET_DIR)/usr/man
+ rm -f $(TARGET_DIR)/sbin/generate-modprobe.conf
+ rm -f $(TARGET_DIR)/sbin/insmod.static
+ touch -c $(MODULE_INIT_TOOLS_TARGET_BINARY)
+
+module-init-tools: uclibc $(MODULE_INIT_TOOLS_TARGET_BINARY)
+
+module-init-tools-clean:
+ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(MODULE_INIT_TOOLS_DIR) uninstall
+ -$(MAKE) -C $(MODULE_INIT_TOOLS_DIR) clean
+
+module-init-tools-dirclean:
+ rm -rf $(MODULE_INIT_TOOLS_DIR)
+
+#############################################################
+
+
+$(MODULE_INIT_TOOLS_DIR2)/.source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
+ $(MODULE_INIT_TOOLS_CAT) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
+ toolchain/patch-kernel.sh $(MODULE_INIT_TOOLS_DIR2) package/module-init-tools \*.patch
+ $(CONFIG_UPDATE) $(MODULE_INIT_TOOLS_DIR2)
+ touch $(MODULE_INIT_TOOLS_DIR2)/.source
+
+$(MODULE_INIT_TOOLS_DIR2)/.configured: $(MODULE_INIT_TOOLS_DIR2)/.source
+ (cd $(MODULE_INIT_TOOLS_DIR2); \
+ CC="$(HOSTCC)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_HOST_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --sysconfdir=/etc \
+ --program-transform-name='' \
+ )
+ touch $(MODULE_INIT_TOOLS_DIR2)/.configured
+
+$(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY): $(MODULE_INIT_TOOLS_DIR2)/.configured
+ $(MAKE) -C $(MODULE_INIT_TOOLS_DIR2)
+ touch -c $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY)
+
+
+$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26: $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY)
+ $(INSTALL) -D $(MODULE_INIT_TOOLS_DIR2)/$(MODULE_INIT_TOOLS_BINARY) $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26
+
+cross-depmod26: $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26
+
+module-init-tools-source cross-depmod26-source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
+
+cross-depmod26-clean:
+ rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod26
+ -$(MAKE) -C $(MODULE_INIT_TOOLS_DIR2) clean
+
+cross-depmod26-dirclean:
+ rm -rf $(MODULE_INIT_TOOLS_DIR2)
+
+ifeq ($(strip $(CONFIG_BR2_PACKAGE_LINUX)),y)
+HOST_SOURCE+=module-init-tools-source
+endif
+
+#############################################################
+#
+## Toplevel Makefile options
+#
+##############################################################
+ifeq ($(strip $(BR2_PACKAGE_MODULE_INIT_TOOLS)),y)
+TARGETS+=module-init-tools
+endif
diff --git a/cleopatre/buildroot/package/module-init-tools/module-init-tools.patch b/cleopatre/buildroot/package/module-init-tools/module-init-tools.patch
new file mode 100644
index 0000000000..456ef1091b
--- /dev/null
+++ b/cleopatre/buildroot/package/module-init-tools/module-init-tools.patch
@@ -0,0 +1,77 @@
+diff -aur module-init-tools-3.1~orig/Makefile.in module-init-tools-3.1~patched/Makefile.in
+--- module-init-tools-3.1~orig/Makefile.in 2004-11-15 01:59:48.000000000 +0100
++++ module-init-tools-3.1~patched/Makefile.in 2005-03-22 22:10:26.843808464 +0100
+@@ -613,7 +613,7 @@
+ check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: check-am
+-all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
++all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+
+ installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir)
+@@ -760,17 +760,10 @@
+
+ release: check clean tarball testsuite
+
+-moveold: check-for-sbin check-for-old move-old-targets
+-
+-check-for-sbin:
+- if [ "`echo $(DESTDIR)$(sbindir) | tr -s / /`" = /sbin ]; then :; \
+- else \
+- echo moveold usually only makes sense when installing into /sbin; \
+- exit 1; \
+- fi
++moveold: move-old-targets
+
+ check-for-old:
+- if [ -f /sbin/lsmod.old ]; then \
++ if [ -f $(sbindir)/lsmod.old ]; then \
+ echo Someone already moved old versions. >&2; exit 1; \
+ fi
+
+@@ -778,27 +771,28 @@
+ # RedHat 8.0 doesn't ship with readlink by default. Use ls -l.
+ # Also, make symlink from /bin to /sbin for lsmod (FHS compliant).
+ move-old-targets:
++ if [ ! -f $(sbindir)/lsmod.old ]; then \
+ for f in lsmod modprobe rmmod depmod insmod modinfo; do \
+- if [ -L /sbin/$$f ]; then \
+- ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f; \
++ if [ -L $(sbindir)/$$f ]; then \
++ ln -sf `ls -l $(sbindir)/$$f | sed 's/.* -> //'`.old $(sbindir)/$$f; \
+ fi; \
+- mv /sbin/$$f /sbin/$$f.old; \
+- if [ -f /usr/share/man/man8/$$f.8.gz ]; then \
+- mv /usr/share/man/man8/$$f.8.gz \
+- /usr/share/man/man8/$$f.old.8.gz; \
+- elif [ -f /usr/share/man/man8/$$f.8.bz2 ]; then \
+- mv /usr/share/man/man8/$$f.8.bz2 \
+- /usr/share/man/man8/$$f.old.8.bz2; \
+- else \
+- mv /usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
++ mv $(sbindir)/$$f $(sbindir)/$$f.old; \
++ if [ -f $(prefix)/usr/share/man/man8/$$f.8.gz ]; then \
++ mv $(prefix)/usr/share/man/man8/$$f.8.gz \
++ $(prefix)/usr/share/man/man8/$$f.old.8.gz; \
++ elif [ -f $(prefix)/usr/share/man/man8/$$f.8.bz2 ]; then \
++ mv $(prefix)/usr/share/man/man8/$$f.8.bz2 \
++ $(prefix)/usr/share/man/man8/$$f.old.8.bz2; \
++ elif [ -f $(prefix)/usr/share/man/man8/$$f.8 ]; then \
++ mv $(prefix)/usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
+ fi; \
+- done
++ done; \
+ for f in kallsyms ksyms; do \
+- if [ -L /sbin/$$f ]; then \
+- ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f; \
++ if [ -L $(sbindir)/$$f ]; then \
++ ln -sf `ls -l $(sbindir)/$$f | sed 's/.* -> //'`.old $(sbindir)/$$f; \
+ fi; \
+- done
+- ln -s /sbin/lsmod.old /bin/lsmod.old
++ done; \
++ fi
+
+ # For installs in /usr/local/sbin
+ links: