Remove mkinitcpio, klibc and udev (for klibc).
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 17 Jul 2010 16:24:17 +0000 (18:24 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 17 Jul 2010 16:24:17 +0000 (18:24 +0200)
config/mkinitcpio/load-modules.sh [deleted file]
config/mkinitcpio/start_udev [deleted file]
config/mkinitcpio/udev.rules [deleted file]
config/mkinitcpio/udev_hook [deleted file]
config/mkinitcpio/udev_install [deleted file]
config/mkinitcpio/virtio [deleted file]
lfs/klibc [deleted file]
lfs/mkinitcpio [deleted file]
lfs/udev
make.sh

diff --git a/config/mkinitcpio/load-modules.sh b/config/mkinitcpio/load-modules.sh
deleted file mode 100644 (file)
index 33f8b6b..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-# Implement blacklisting for udev-loaded modules
-#   Includes module checking
-# - Aaron Griffin & Tobias Powalowski for Archlinux
-[ $# -ne 1 ] && exit 1
-
-if [ -f /proc/cmdline ]; then 
-       for cmd in $(cat /proc/cmdline); do
-               case $cmd in
-                       *=*) eval $cmd ;;
-               esac
-       done
-fi
-
-# get the real names from modaliases
-i="$(/bin/modprobe -i --show-depends $1 | minised "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" | minised 's|-|_|g')"
-# add disablemodules= from commandline to blacklist
-k="$(echo ${disablemodules} | minised 's|-|_|g' | minised 's|,| |g')"
-
-if [ "${k}" != "" ] ; then
-       for o in ${k}; do
-               echo "${o}.ko" >> /disablemodules
-       done
-        for n in ${i}; do
-               if /bin/ugrep "^$n.ko" /disablemodules 2>&1 >/dev/null; then
-                       exit 1
-               fi
-       done
-fi
-/bin/modprobe $1
-
-# vim: set et ts=4:
diff --git a/config/mkinitcpio/start_udev b/config/mkinitcpio/start_udev
deleted file mode 100644 (file)
index 44e3272..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-#! /bin/sh
-#
-# start_udev
-# script to initialize /dev by using udev.
-#
-# Modified for Archlinux by Tobias Powalowski <tpowa@archlinux.org>
-#
-# Inspired by:
-# 
-# Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
-#
-# Released under the GPL v2 only.
-#
-# This needs to be run at the earliest possible point in the boot 
-# process.
-#
-# Based on the udev init.d script
-#
-# Thanks go out to the Gentoo developers for proving 
-# that this is possible to do.
-#
-# Yes, it's very verbose, feel free to turn off all of the echo calls,
-# they were there to make me feel better that everything was working
-# properly during development...
-
-prog=udev
-sysfs_dir=/sys
-bin=/sbin/udev
-udevd=/sbin/udevd
-udev_root="/dev"
-
-trigger_device_events () 
-{
-       /sbin/udevtrigger
-}
-
-wait_for_queue () 
-{
-       # disabled because it hangs network boot
-       #loop=20
-        #while ! [ "$loop" -gt 0 -a -d /dev/.udev/queue ]; do
-        #           sleep 0.1;
-        #           loop=$(($loop - 1))
-        #done
-       /sbin/udevsettle
-}
-
-make_extra_nodes () 
-{
-       # there are a few things that sysfs does not export for us.
-       # these things go here (and remember to remove them in 
-       # remove_extra_nodes()
-       #
-       # Thanks to Gentoo for the initial list of these.
-       ln -sf /proc/self/fd $udev_root/fd
-       ln -sf /proc/self/fd/0 $udev_root/stdin
-       ln -sf /proc/self/fd/1 $udev_root/stdout
-       ln -sf /proc/self/fd/2 $udev_root/stderr
-       ln -sf /proc/kcore $udev_root/core
-}
-
-udev_init  () 
-{
-# don't use udev if sysfs is not mounted.
-if [ ! -d $sysfs_dir/block ]; then
-       exit 1
-fi
-
-#echo "mounting... ramfs at $udev_root"
-mount -t ramfs none $udev_root
-
-# propogate /udev from /sys
-#echo "Creating initial udev device nodes:"
-
-#echo "making extra nodes"
-make_extra_nodes
-
-# check if udevd is already running
-#echo "start udev daemon"
-/sbin/udevd --daemon
-
-case "$(uname -r)" in
-       2.6.[0-9]|2.6.[0-9][!0-9]*) ;;
-       *)      if [ -f "/sys/class/tty/console/uevent" ]; then
-                       #echo "Kernel >= 2.6.15 and supports uevents"
-                       # trigger the sorted events
-                       echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
-                       # catch events that are real fast
-                       mkdir -p /dev/.udev/queue
-               else
-                       # for older kernels without uevents will be removed when udevstart dies in udev
-                       echo "Kernel does not support uevents, you need a kernel >= 2.6.15!"
-                       exit 1
-               fi 
-       ;;
-esac
-}
-
-udev_uevents () 
-{
-# configure all devices
-trigger_device_events
-# until we know how to do better, just wait for _all_ events to finish
-wait_for_queue
-}
-
-if [ $# -eq 0 ]; then
-udev_init
-udev_uevents
-fi
-
-[ "$1" = "init" ] && udev_init
-[ "$1" = "uevents" ] && udev_uevents
-
-exit 0
diff --git a/config/mkinitcpio/udev.rules b/config/mkinitcpio/udev.rules
deleted file mode 100644 (file)
index 939a946..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org>
-#
-# This ruleset should provide a DevFS-compatible device tree.
-#
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %k the kernel name for the device.
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute.
-# %% the '%' char itself.
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields.  See the udev man page for a full description of them.
-# global stuff
-#
-
-#####################################
-# Early rules - begin
-#####################################
-# wait for sysfs
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
-
-#####################################
-# Early rules -end
-#####################################
-
-#####################################
-###### Hotplug rules - begin
-#####################################
-# check if the device has already been claimed by a driver
-ENV{PHYSDEVDRIVER}=="?*", GOTO="hotplug_driver_loaded"
-
-# Modaliases to load
-ACTION=="add", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
-# SCSI addon modules
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", RUN+="/lib/udev/load-modules.sh sd_mod"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", RUN+="/lib/udev/load-modules.sh sd_mod"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", RUN+="/lib/udev/load-modules.sh sr_mod"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", SYSFS{model}!="ADR*", RUN+="/lib/udev/load-modules.sh osst"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", SYSFS{model}=="ADR*", RUN+="/lib/udev/load-modules.sh st"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="Onstream", RUN+="/lib/udev/load-modules.sh st"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", RUN+="/lib/udev/load-modules.sh sg"
-
-LABEL="hotplug_driver_loaded"
-
-# FIRMWARE
-ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="?*", RUN+="/lib/udev/firmware.sh"
-#####################################
-##### Hotplug rules - end
-#####################################
-
-#####################################
-###### CD/DVD symlinks - begin
-#####################################
-ACTION=="add", BUS=="ide", KERNEL=="hd[a-z]", IMPORT="/lib/udev/cdrom_id --export $tempnode"
-ACTION=="add", BUS=="scsi",    KERNEL=="sr[0-9]*", IMPORT="/lib/udev/cdrom_id --export $tempnode"
-ACTION=="add", BUS=="scsi",    KERNEL=="scd[a-z]", IMPORT="/lib/udev/cdrom_id --export $tempnode"
-ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b"
-ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b"
-ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b"
-ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvd-%b"
-#####################################
-###### CD/DVD symlinks - end
-#####################################
diff --git a/config/mkinitcpio/udev_hook b/config/mkinitcpio/udev_hook
deleted file mode 100644 (file)
index fc4c814..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    msg -n ":: Loading udev..."
-    /etc/start_udev
-    msg "done."
-}
diff --git a/config/mkinitcpio/udev_install b/config/mkinitcpio/udev_install
deleted file mode 100644 (file)
index 473956a..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# vim:set ft=sh:
-
-install ()
-{
-    MODULES=""
-    BINARIES=""
-    FILES=" /etc/udev/udev.conf"
-    SCRIPT="udev"
-    add_file /lib/initcpio/udev/udevd /sbin/udevd
-    add_file /lib/initcpio/udev/udevtrigger /sbin/udevtrigger
-    add_file /lib/initcpio/udev/udevsettle /sbin/udevsettle
-    add_file /lib/initcpio/udev/udev.rules /etc/udev/rules.d/udev.rules
-    add_file /lib/initcpio/udev/start_udev /etc/start_udev
-    add_file /lib/initcpio/udev/firmware.sh /lib/udev/firmware.sh
-    add_file /lib/initcpio/udev/cdrom_id /lib/udev/cdrom_id
-    add_file /lib/initcpio/udev/load-modules.sh /lib/udev/load-modules.sh
-}
-
-help ()
-{
-cat <<HELPEOF
-  This hook will use udev to create your root device node
-  and detect the needed modules for your root device.
-  It is recommended to use this hook instead of modload.
-HELPEOF
-}
diff --git a/config/mkinitcpio/virtio b/config/mkinitcpio/virtio
deleted file mode 100644 (file)
index 0ba99d3..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# vim: set ft=sh:
-
-install ()
-{
-    MODULES=" $(checked_modules "block/virtio_blk") "
-
-    MODULES=$(echo ${MODULES}) #trim whitespace
-    if [ "x${MODULES}" != "x" ]; then
-        MODULES="${MODULES} virtio_pci"
-    fi
-
-    BINARIES=""
-    FILES=""
-    SCRIPT=""
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook loads the necessary modules for an virtio root device.
-  Detection will take place at runtime. To minimize the modules
-  in the image, add the autodetect hook too.
-HELPEOF
-}
diff --git a/lfs/klibc b/lfs/klibc
deleted file mode 100644 (file)
index 1ab1215..0000000
--- a/lfs/klibc
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program 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 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.5.14
-
-THISAPP    = klibc-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE) \
-               klibc-extras-2.2.tar.gz \
-               klibc-1.5.14-linux2.6.27-includes.tar.bz2
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-klibc-extras-2.2.tar.gz = $(DL_FROM)/klibc-extras-2.2.tar.gz
-klibc-1.5.14-linux2.6.27-includes.tar.bz2 = $(DL_FROM)/klibc-1.5.14-linux2.6.27-includes.tar.bz2
-
-$(DL_FILE)_MD5 = 030d978a7f16800e8ccae12d6fb5e7ba
-klibc-extras-2.2.tar.gz_MD5 = 7e5042978531048c369f59ca1a13055b
-klibc-1.5.14-linux2.6.27-includes.tar.bz2_MD5 = 1f875129d35193e35d27ed2b61a80bb6
-
-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) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/klibc* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) && \
-               tar zxf $(DIR_DL)/klibc-extras-2.2.tar.gz
-       cd $(DIR_SRC) && tar jxf $(DIR_DL)/klibc-1.5.14-linux2.6.27-includes.tar.bz2
-
-       cd $(DIR_SRC)/klibc-extras && sed -i "s|^INSTALL = .*|INSTALL = /usr/bin/install -c -m 755|g" Makefile
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make install
-       cd $(DIR_SRC)/klibc-extras && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_SRC)/klibc-extras && make install
-       ln -sf sh.shared /usr/lib/klibc/bin/sh
-       @rm -rf $(DIR_APP) $(DIR_SRC)/klibc*
-       @$(POSTBUILD)
diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio
deleted file mode 100644 (file)
index 47de3ea..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program 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 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.5.9
-
-THISAPP    = mkinitcpio-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/mkinitcpio
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = a80ca2af36962eaf85a7861ddfd4eea7
-
-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) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./install.sh ""
-       cp $(DIR_SRC)/config/mkinitcpio/virtio /lib/initcpio/install/
-       sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
-       sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio filesystems"|g' /etc/mkinitcpio.conf
-       sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ehci_hcd"|g' /etc/mkinitcpio.conf
-       sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide
-       sed -i 's| gzip -9 | lzma |g' /sbin/mkinitcpio
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
index 4667ff4..545111f 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -32,13 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(LFS_PASS)" "install"
        TARGET     = $(DIR_INFO)/$(THISAPP)-install
-else
-ifeq "$(KLIBC)" "1"
-       TARGET     = $(DIR_INFO)/$(THISAPP)-klibc
 else
        TARGET     = $(DIR_INFO)/$(THISAPP)
 endif
-endif
 
 ###############################################################################
 # Top-level Rules
@@ -106,28 +102,6 @@ ifeq "$(LFS_PASS)" "install"
        cd /install/initrd/dev && mknod -m 0600 tty6 c 4 6
        cp -f /etc/udev/rules.d/55-scsi-cdrom.rules /install/initrd/etc/udev/rules.d/55-scsi-cdrom.rules
 
-else
-ifeq "$(KLIBC)" "1"
-       cd $(DIR_APP) && sed -i "s|USE_LOG = .*|USE_LOG = false|g" Makefile
-       cd $(DIR_APP) && sed -i "s|USE_KLIBC = .*|USE_KLIBC = true|g" Makefile
-
-       cd $(DIR_APP) && make PROGRAMS="udevd udevsettle udevtrigger" EXTRAS="extras/firmware extras/cdrom_id"
-
-       -mkdir -p /lib/initcpio/udev
-       -mkdir -p /lib/initcpio/install
-       -mkdir -p /lib/initcpio/hooks
-       cd $(DIR_APP) && install -m755 udevd /lib/initcpio/udev
-       cd $(DIR_APP) && install -m755 udevtrigger  /lib/initcpio/udev
-       cd $(DIR_APP) && install -m755 udevsettle  /lib/initcpio/udev
-       cd $(DIR_APP) && install -m755 extras/firmware/firmware.sh  /lib/initcpio/udev
-       cd $(DIR_APP) && install -m755 extras/cdrom_id/cdrom_id  /lib/initcpio/udev
-       
-       install -m755 $(DIR_SRC)/config/mkinitcpio/start_udev /lib/initcpio/udev
-       install -m644 $(DIR_SRC)/config/mkinitcpio/udev.rules  /lib/initcpio/udev
-       install -m755 $(DIR_SRC)/config/mkinitcpio/load-modules.sh /lib/initcpio/udev
-       install -m644 $(DIR_SRC)/config/mkinitcpio/udev_install /lib/initcpio/install/udev
-       install -m644 $(DIR_SRC)/config/mkinitcpio/udev_hook /lib/initcpio/hooks/udev
-
 else
        rm -rf /lib/udev/devices
        cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2
@@ -154,7 +128,6 @@ else
        chmod 755 /etc/udev/dvb.sh
        touch /etc/udev/rules.d/30-persistent-network.rules
        cp -vf $(DIR_SRC)/config/udev/blacklist /etc/modprobe.d/blacklist
-endif
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 4566d6e..50f0f6f 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -373,9 +373,6 @@ buildipfire() {
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
-  ipfiremake klibc
-  ipfiremake mkinitcpio
-  ipfiremake udev                      KLIBC=1
   ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm