Changeset 563


Ignore:
Timestamp:
04/18/13 09:57:15 (7 years ago)
Author:
dennis
Message:

First changed for 1.6.0

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/CHANGELOG

    r562 r563  
     11.6.0
     2  * Rewrote /init script as a lot has changed with udev since version 166
     3 
     4  * Added some options in the kernel config to make it work with udev 182
     5
     6  * Replaced module-init-tools with kmod as module-init-tools is deprecated.
     7    lsmod/rmmod/insmod/modprobe are now symlinks for /bin/kmod
     8
     9  * Added kmod version 13
     10  * Updated udev to 182
     11  * Updated aria2 to 1.15.1
     12  * Updated curl to 7.27.0
     13  * Updated lvm to 2.2.02.96
     14  * Updated mdadm to 3.2.6
     15
    1161.5.8
    217  * Added the server tools to the tarball
  • trunk/Makefile.in

    r562 r563  
    1818
    1919ifeq ($(ARCH_BIT),64)
    20         LIBDIR=lib64
     20        LIBDIR=/lib/x86_64-linux-gnu
    2121else
    2222        LIBDIR=lib
  • trunk/VERSION

    r562 r563  
    1 1.5.8
     11.6.0
  • trunk/initrd/make.d/curl.rul

    r412 r563  
    44#
    55
    6 CURL_VERSION    = 7.23.1
     6CURL_VERSION    = 7.27.0
    77CURL_TARBALL    = curl-$(CURL_VERSION).tar.bz2
    88
  • trunk/initrd/make.d/kerneltools.rul

    r398 r563  
    44#
    55
    6 KERNELTOOLS_VERSION             = 3.12
    7 KERNELTOOLS_TARBALL     = module-init-tools-$(KERNELTOOLS_VERSION).tar.gz
    8 KERNELTOOLS_DIR                         = $(SRC_DIR)/module-init-tools-$(KERNELTOOLS_VERSION)
     6KERNELTOOLS_VERSION             = 13
     7KERNELTOOLS_TARBALL     = kmod-$(KERNELTOOLS_VERSION).tar.gz
     8KERNELTOOLS_DIR         = $(SRC_DIR)/kmod-$(KERNELTOOLS_VERSION)
    99
    1010### http://www.kernel.org/pub/linux/utils/kernel/module-init-tools #####
    1111KERNELTOOLS_URL         := ftp://ftp.sara.nl/pub/sali/sources/$(KERNELTOOLS_TARBALL)
    12 KERNELTOOLS_INFO        := https://modules.wiki.kernel.org/index.php/Main_Page
     12KERNELTOOLS_INFO        := https://https://www.kernel.org/pub/linux/utils/kernel/kmod
    1313
    1414.PHONY: kerneltools
     
    2222
    2323$(KERNELTOOLS_DIR).build:    $(KERNELTOOLS_DIR).get
    24         cd $(KERNELTOOLS_DIR) && ./configure --bindir=/bin --sbindir=/sbin
     24        cd $(KERNELTOOLS_DIR) && ./configure --bindir=/bin --sbindir=/sbin --disable-manpages --enable-static
    2525        $(MAKE) -j $(NCPUS) -C $(KERNELTOOLS_DIR)
    2626        touch $@
    2727
    2828$(KERNELTOOLS_DIR).install: $(KERNELTOOLS_DIR).build
    29         $(MAKE) -j $(NCPUS) -C $(KERNELTOOLS_DIR) DESTDIR=$(INITRD_BUILD_DIR) install
     29        cd $(KERNELTOOLS_DIR) && DESTDIR=$(INITRD_BUILD_DIR) make install
     30        cd $(INITRD_BUILD_DIR)/sbin && ln -fs ../bin/kmod modprobe
     31        cd $(INITRD_BUILD_DIR)/sbin && ln -fs ../bin/kmod depmod
     32        cd $(INITRD_BUILD_DIR)/sbin && ln -fs ../bin/kmod insmod
     33        cd $(INITRD_BUILD_DIR)/sbin && ln -fs ../bin/kmod lsmod
     34        cd $(INITRD_BUILD_DIR)/sbin && ln -fs ../bin/kmod modinfo
     35        cd $(INITRD_BUILD_DIR)/sbin && ln -fs ../bin/kmod rmmod
     36        cd $(INITRD_BUILD_DIR)/sbin && ln -fs ../bin/kmod lsmod
    3037        touch $@
    3138
  • trunk/initrd/make.d/mdadm.rul

    r521 r563  
    66#
    77
    8 MDADM_VERSION   = 3.2.5
     8MDADM_VERSION   = 3.2.6
    99MDADM_DIR                       = $(SRC_DIR)/mdadm-$(MDADM_VERSION)
    1010MDADM_TARBALL   = mdadm-$(MDADM_VERSION).tar.gz
  • trunk/initrd/make.d/udev.rul

    r525 r563  
    1111UDEV_INFO       = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
    1212
    13 UDEV_CONFIGURE_DEFAULT  = --prefix=/usr --sysconfdir=/etc --sbindir=/sbin --libdir=/lib --with-rootlibdir=/lib --libexecdir=/lib/udev --disable-introspection
     13UDEV_CONFIGURE_DEFAULT  = --prefix=/usr --sysconfdir=/etc --sbindir=/sbin --libdir=/lib --with-rootlibdir=/lib --libexecdir=/lib --disable-introspection
    1414UDEV_CONFIGURE          = $(UDEV_CONFIGURE_DEFAULT)
    15 
    16 ifeq ($(ARCH),ppc64)
    17         UDEV_CONFIGURE = USBUTILS_CFLAGS=-I$(INITRD_BUILD_DIR)/include USBUTILS_LIBS=-L$(INITRD_BUILD_DIR)/lib $(UDEV_CONFIGURE_DEFAULT)
    18 endif
    1915
    2016export LD_LIBRARY_PATH="$${LD_LIBRARY_PATH}:$(INITRD_BUILD_DIR)/lib:$(INITRD_BUILD_DIR)/usr/lib"
     
    2420
    2521$(UDEV_DIR).build:  $(UDEV_DIR).get
    26         cd $(UDEV_DIR) && CFLAGS="-I$(INITRD_BUILD_DIR)/usr/include -L$(INITRD_BUILD_DIR)/usr/lib" \
    27         ./configure $(UDEV_CONFIGURE) && make
     22        #cd $(UDEV_DIR) && CFLAGS="-I$(INITRD_BUILD_DIR)/usr/include -L$(INITRD_BUILD_DIR)/usr/lib" \
     23        cd $(UDEV_DIR) && ./configure $(UDEV_CONFIGURE) && make
    2824        touch $@
    2925
  • trunk/initrd/sali/init

    r525 r563  
    1 #!/bin/sh
     1#/!/bin/sh
     2#
     3# This file is part of SALI
     4#
     5# SALI is free software: you can redistribute it and/or modify
     6# it under the terms of the GNU General Public License as published by
     7# the Free Software Foundation, either version 3 of the License, or
     8# (at your option) any later version.
     9#
     10# SALI is distributed in the hope that it will be useful,
     11# but WITHOUT ANY WARRANTY; without even the implied warranty of
     12# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13# GNU General Public License for more details.
     14#
     15# You should have received a copy of the GNU General Public License
     16# along with SALI.  If not, see <http://www.gnu.org/licenses/>.
     17#
     18# 2013 SURFsara
    219
     20## For init we don't want to rely on $PATH
     21_PRINTF="/usr/bin/printf"
     22_MOUNT="/bin/mount"
     23_CAT="/bin/cat"
     24_MKDIR="/bin/mkdir"
     25_GREP="/bin/grep"
     26_UDEVD="/lib/udev/udevd"
     27_UDEVADM="/usr/bin/udevadm"
     28_LS="/bin/ls"
     29_MKNOD="/bin/mknod"
     30_DMESG="/bin/dmesg"
    331
    4 ## Mounting some important filesystems
    5 mkdir -p /proc
    6 mount proc /proc -t proc
     32## Are we allowed to run?
     33if [ -n "$($_MOUNT | $_GREP "/dev")" ]
     34then
     35    $_PRINTF "Looks like /dev is already mounted, this script can only be used for initialization of SALI\n"
     36    exit 1
     37fi
    738
    8 mkdir -p /sys
    9 mount sysfs /sys -t sysfs
    10 ## End
     39## Default value for init
     40init="/sbin/init"
    1141
    12 init="/sbin/init"
    13 udev=y
     42## Checking of these directories exists
     43for directory in "/proc" "/sys" "/dev" "/run"
     44do
     45    if [ ! -d "${directory}" ]
     46    then
     47        $_MKDIR -p "${directory}"
     48    fi
     49done
    1450
    15 for i in $(cat /proc/cmdline); do
    16     case $i in
     51## Mount /proc, /sys and /dev
     52# -o == Which options must be use when mounting
     53$_MOUNT -t proc proc /proc
     54$_MOUNT -t sysfs sysfs /sys
     55$_MOUNT -t devtmpfs -o mode=0755 tmpfs /dev
     56$_MOUNT -t tmpfs -o mode=0755 tmpfs /run
     57
     58## Fast scan of the kernel paramaters
     59for option in $(cat /proc/cmdline)
     60do
     61    case "${option}" in
    1762        init=*)
    18             init=${i#init=}
    19             ;; 
    20                 BLACKLIST=*)
    21                         blacklist=${i#BLACKLIST=}
    22                 ;;
    23         MDEV=y)
    24             udev=n
     63            init=${option#init=}
     64        ;;
     65        BLACKLIST=*)
     66            blacklist=${option#BLACKLIST=}
    2567        ;;
    2668    esac
    2769done
    2870
    29 # Filling the blacklist with modules from de
    30 # kernel cmdline
     71## Creating blacklist file
    3172if [ -n "${blacklist}" ]
    3273then
    33         cat /dev/null > /etc/modprobe.d/pxe_blacklist.conf
    34         for module in $(echo $blacklist | tr ';' ' ')
    35         do
    36                 echo "blacklist ${module}" >> /etc/modprobe.d/pxe_blacklist.conf
    37         done
     74    # Make sure the file exists and is empty
     75    $_CAT /dev/null /etc/modprobe.d/pxe_blacklist.conf
     76    for module in $(echo $blacklist | sed 's/;/ /g')
     77    do
     78        $_PRINTF "blacklist ${module}\n" >> /etc/modprobe.d/pxe_blacklist.conf
     79    done
    3880fi
    3981
     82####
     83## Now the real initialization of SALI
     84$_PRINTF "Initializing SALI...\n"
    4085
    41 make_extra_nodes() {
    42   [ -e /etc/udev/links.conf ] || return 0
    43   grep '^[^#]' /etc/udev/links.conf | \
    44   while read type name arg1; do
    45     [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
    46     case "$type" in
    47       L) ln -s $arg1 /dev/$name ;;
    48       D) mkdir -p /dev/$name ;;
    49       M) mknod -m 600 /dev/$name $arg1 ;;
    50       *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
    51     esac
    52   done
    53 }
     86## Make sure /sys/kernel/uevent_helper has just a empty line
     87$_PRINTF "\n" > /sys/kernel/uevent_helper
    5488
    55 mount_dev_pts(){
    56     mkdir -p /dev/pts
    57     mount devpts /dev/pts -t devpts
    58 }
     89## Make some extra nodes that have been configured in
     90## /etc/udev/links.conf
     91if [ -e "/etc/udev/links.conf" ]
     92then
     93    # make sure we don't have any comments or empty lines
     94    $_GREP '^[^#]' /etc/udev/links.conf | while read type name args
     95    do
     96        if [ "${type}" -a "${name}" -a ! -e "/dev/${name}" -a ! -L "/dev/${name}" ]
     97        then
     98            continue
     99        fi
     100        case "${type}" in
     101            L)
     102                $_LS -s "${args}" "/dev/${name}"
     103            ;;
     104            D)
     105                $_MKDIR -p "/dev/${name}"
     106            ;;
     107            M)
     108                $_MKNOD -m 600 "/dev/${name}" $args
     109            ;;
     110            *)
     111                $_PRINTF "/etc/udev/links/conf; unparseable line (${type} ${name} ${args})\n"
     112            ;;
     113        esac
     114    done
     115fi
    59116
    60117## Starting udev
    61 start_udev() {
     118$_PRINTF "Starting udev...\n"
     119if $_UDEVD --daemon
     120then
     121    $_PRINTF "Started udevd\n"
     122else
     123    $_PRINTF "Waiting for 15 seconds an try to continue anyway!\n"
     124    sleep 15
     125fi
    62126
    63     echo -e "Starting udev...\n"
    64     echo > /sys/kernel/uevent_helper
     127# Wait for udev to process the events in the queue
     128$_UDEVADM trigger --action=add
    65129
    66     mount -n -o mode=0755 -t tmpfs tmpfs /dev
    67     make_extra_nodes
     130sleep 2
    68131
    69     /sbin/udevd --daemon
     132$_UDEVADM settle
    70133
    71     udevadm trigger
    72     udevadm settle
     134# Now mount /dev/pts as devpts
     135if [ ! -e "/dev/pts" ]
     136then
     137    $_MKDIR -p /dev/pts
     138fi
     139$_MOUNT devpts /dev/pts -t devpts -n
    73140
    74     mount_dev_pts
     141$_PRINTF "Done with udev initalization, continue booting into SALI...\n"
    75142
    76     if [ -d /sys/bus/scsi ]; then
    77         modprobe -q scsi_wait_scan && modprobe -r scsi_wait_scan || true
    78         udevadm settle || true
    79     fi
     143# Change console-level to 6
     144$_DMESG -n 6
    80145
    81     echo -e "Done with udev initialization, starting sali...\n"
    82 }
    83 
    84 start_mdev() {
    85     echo -e "Starting mdev...\n"
    86 
    87     mount_dev_pts
    88 
    89     echo /sbin/mdev > /proc/sys/kernel/hotplug
    90     /sbin/mdev -s
    91 
    92     echo -e "Done with mdev initialization, starting sali...\n"
    93 }
    94 
    95 case "${udev}" in
    96     n)
    97         start_mdev
    98     ;;
    99     *)
    100         start_udev
    101     ;;
    102 esac
    103    
    104 dmesg -n 6
    105 
     146## Now start SALI
    106147exec $init
  • trunk/kernel/patches/linux.x86_64.config

    r562 r563  
    277277#
    278278CONFIG_ZONE_DMA=y
    279 CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
    280279CONFIG_SMP=y
    281280CONFIG_X86_MPPARSE=y
     
    628627#
    629628CONFIG_UEVENT_HELPER_PATH=""
    630 # CONFIG_DEVTMPFS is not set
     629CONFIG_DEVTMPFS=y
     630# CONFIG_DEVTMPFS_MOUNT is not set
    631631CONFIG_STANDALONE=y
    632632CONFIG_PREVENT_FIRMWARE_BUILD=y
     
    848848CONFIG_SCSI_QLA_FC=m
    849849CONFIG_SCSI_QLA_ISCSI=m
    850 # CONFIG_SCSI_LPFC is not set
     850CONFIG_SCSI_LPFC=m
    851851CONFIG_SCSI_DC395x=m
    852852CONFIG_SCSI_DC390T=m
     
    12791279CONFIG_KEYBOARD_STOWAWAY=y
    12801280CONFIG_KEYBOARD_SUNKBD=y
    1281 CONFIG_KEYBOARD_OMAP4=m
    12821281CONFIG_KEYBOARD_XTKBD=y
    12831282CONFIG_INPUT_MOUSE=y
     
    16871686# CONFIG_DRM is not set
    16881687# CONFIG_STUB_POULSBO is not set
    1689 CONFIG_VGASTATE=m
     1688# CONFIG_VGASTATE is not set
    16901689CONFIG_VIDEO_OUTPUT_CONTROL=m
    16911690CONFIG_FB=m
    16921691# CONFIG_FIRMWARE_EDID is not set
    1693 CONFIG_FB_DDC=m
     1692# CONFIG_FB_DDC is not set
    16941693# CONFIG_FB_BOOT_VESA_SUPPORT is not set
    16951694CONFIG_FB_CFB_FILLRECT=m
     
    17071706# CONFIG_FB_MACMODES is not set
    17081707# CONFIG_FB_BACKLIGHT is not set
    1709 CONFIG_FB_MODE_HELPERS=y
     1708# CONFIG_FB_MODE_HELPERS is not set
    17101709CONFIG_FB_TILEBLITTING=y
    17111710
Note: See TracChangeset for help on using the changeset viewer.