Revision: 7848
http://sourceforge.net/p/ipcop/svn/7848
Author: owes
Date: 2015-02-01 18:39:07 +0000 (Sun, 01 Feb 2015)
Log Message:
-----------
Replace module-init-tools with kmod
Modified Paths:
--------------
ipcop/trunk/make.sh
ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
Added Paths:
-----------
ipcop/trunk/config/rootfiles/common/kmod
ipcop/trunk/lfs/kmod
Removed Paths:
-------------
ipcop/trunk/config/rootfiles/common/module-init-tools
ipcop/trunk/lfs/module-init-tools
Added: ipcop/trunk/config/rootfiles/common/kmod
===================================================================
--- ipcop/trunk/config/rootfiles/common/kmod (rev 0)
+++ ipcop/trunk/config/rootfiles/common/kmod 2015-02-01 18:39:07 UTC (rev
7848)
@@ -0,0 +1,12 @@
+bin/kmod
+bin/lsmod
+sbin/depmod
+sbin/modinfo
+sbin/modprobe
+#usr/include/libkmod.h
+#usr/lib/libkmod.la
+#usr/lib/libkmod.so
+usr/lib/libkmod.so.2
+usr/lib/libkmod.so.2.2.9
+#usr/lib/pkgconfig/libkmod.pc
+#usr/share/bash-completion/completions/kmod
Deleted: ipcop/trunk/config/rootfiles/common/module-init-tools
===================================================================
--- ipcop/trunk/config/rootfiles/common/module-init-tools 2015-02-01
18:37:48 UTC (rev 7847)
+++ ipcop/trunk/config/rootfiles/common/module-init-tools 2015-02-01
18:39:07 UTC (rev 7848)
@@ -1,18 +0,0 @@
-bin/lsmod
-sbin/depmod
-#sbin/insmod
-sbin/modinfo
-sbin/modprobe
-#sbin/rmmod
-#usr/share/man/man5/depmod.conf.5
-#usr/share/man/man5/depmod.d.5
-#usr/share/man/man5/modprobe.conf.5
-#usr/share/man/man5/modprobe.d.5
-#usr/share/man/man5/modules.dep.5
-#usr/share/man/man5/modules.dep.bin.5
-#usr/share/man/man8/depmod.8
-#usr/share/man/man8/insmod.8
-#usr/share/man/man8/lsmod.8
-#usr/share/man/man8/modinfo.8
-#usr/share/man/man8/modprobe.8
-#usr/share/man/man8/rmmod.8
Added: ipcop/trunk/lfs/kmod
===================================================================
--- ipcop/trunk/lfs/kmod (rev 0)
+++ ipcop/trunk/lfs/kmod 2015-02-01 18:39:07 UTC (rev 7848)
@@ -0,0 +1,106 @@
+###############################################################################
+# This file is part of the IPCop Firewall. #
+# #
+# IPCop is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPCop is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPCop; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Makefiles are based on LFSMake, which is #
+# Copyright (C) 2002 Rod Roard <r...@sunsetsystems.com>
#
+# #
+# Modifications by: #
+# ??-12-2003 Mark Wormgoor < m...@wormgoor.com> #
+# - Modified Makefile for IPCop build #
+# #
+# $Id$
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME = kmod
+VER = 19
+HOST_ARCH = all
+OTHER_SRC = yes
+
+THISAPP = $(PKG_NAME)-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_KERNEL)/linux/utils/kernel/kmod
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = a08643f814aa4efc12211c6e5909f4d9
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --bindir=/bin \
+ --sysconfdir=/etc \
+ --disable-manpages \
+ --with-xz --with-zlib
+
+ cd $(DIR_APP) && make
+
+ifeq "$(RUNNING_TEST)" "yes"
+ cd $(DIR_APP) && make check
+endif
+
+ cd $(DIR_APP) && make install
+ for target in depmod modinfo modprobe; do \
+ ln -svf /bin/kmod /sbin/$$target; \
+ done
+ ln -svf /bin/kmod /bin/lsmod
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
Property changes on: ipcop/trunk/lfs/kmod
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Deleted: ipcop/trunk/lfs/module-init-tools
===================================================================
--- ipcop/trunk/lfs/module-init-tools 2015-02-01 18:37:48 UTC (rev 7847)
+++ ipcop/trunk/lfs/module-init-tools 2015-02-01 18:39:07 UTC (rev 7848)
@@ -1,113 +0,0 @@
-###############################################################################
-# This file is part of the IPCop Firewall. #
-# #
-# IPCop is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPCop is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPCop; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Makefiles are based on LFSMake, which is #
-# Copyright (C) 2002 Rod Roard <r...@sunsetsystems.com>
#
-# #
-# Modifications by: #
-# ??-12-2003 Mark Wormgoor < m...@wormgoor.com> #
-# - Modified Makefile for IPCop build #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = module-init-tools
-VER = 3.16
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = module-init-tools-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-#DL_FROM = $(URL_KERNEL)/linux/utils/kernel/module-init-tools
-# alternative location until kernel.org has completely recovered:
-DL_FROM = http://ipcop-addons.mooo.com/misc/IPCop
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE) \
- $(PATCH1)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = bc44832c6e41707b8447e2847d2019f5
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_gzFile-typedef.patch
-
-ifeq "$(RUNNING_TEST)" "yes"
- # A special build is compiled for testing, not suitable for normal
usage and cleaned at end
- # Build use originally both --enable-zlib and --disable-zlib
- # Prefer to use our shared libz.so for testing and workaround a
docbook2man issue
- cd $(DIR_APP) && sed -i -e 's|--enable-zlib |--enable-zlib-dynamic |' \
- -e 's@../../configure@DOCBOOKTOMAN=/bin/true
&@' tests/runtests
- # no test should fail
- cd $(DIR_APP) && export DOCBOOKTOMAN=/bin/true VERBOSE=1; \
- ( ./configure && \
- make check && \
- ./tests/runtests ) &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
- cd $(DIR_APP) && make clean
-endif
-
- cd $(DIR_APP) && DOCBOOKTOMAN=/bin/true ./configure --prefix=/usr \
- --exec-prefix=/ \
- --enable-zlib-dynamic \
- --disable-static-utils
-
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make INSTALL=install install
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2015-02-01 18:37:48 UTC (rev 7847)
+++ ipcop/trunk/make.sh 2015-02-01 18:39:07 UTC (rev 7848)
@@ -1800,10 +1800,9 @@
chroot_make gzip # gzip zless tests require less
chroot_make iproute2
chroot_make kbd
+ chroot_make xz # required by kmod/compressed modules
+ chroot_make kmod
chroot_make make
- chroot_make xz # man-db depend of xz, but we don't
build man-db
- chroot_make module-init-tools
- #chroot_make kmod
chroot_make patch
chroot_make json-c # required by rsyslog
chroot_make rsyslog
Modified: ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0
===================================================================
--- ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2015-02-01 18:37:48 UTC
(rev 7847)
+++ ipcop/trunk/updates/2.2.0/ROOTFILES.i486-2.2.0 2015-02-01 18:39:07 UTC
(rev 7848)
@@ -20,6 +20,16 @@
/usr/lib/libgthread-2.0.so.0
/usr/lib/libgthread-2.0.so.0.4200.1
##
+## kmod-19
+/bin/kmod
+/bin/kmod
+/bin/lsmod
+/sbin/depmod
+/sbin/modinfo
+/sbin/modprobe
+/usr/lib/libkmod.so.2
+/usr/lib/libkmod.so.2.2.9
+##
## libffi-3.2.1
/usr/lib/libffi.so.6
/usr/lib/libffi.so.6.0.4
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
