From 68739e23aca9fbfe03d42069ad145a09c2ed023f Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Wed, 24 Oct 2012 12:51:25 -0500 Subject: [PATCH] Multiple updates for 2.8 (added hpsa/hid-logitech-dj, fixed a stupid mistake in init, updated doc versions, added glu to packages.xorg) --- doc/handbook/get_wiki_handbook | 2 +- doc/handbook/get_wiki_release_notes | 2 +- initramfs/init | 8 ++++---- initramfs/initramfs.lst | 2 ++ iso/setup.dependencies | 3 ++- kernel/linux-3.5.4.config | 3 +-- packages.xorg | 1 + 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/handbook/get_wiki_handbook b/doc/handbook/get_wiki_handbook index 2768278..5a50f31 100755 --- a/doc/handbook/get_wiki_handbook +++ b/doc/handbook/get_wiki_handbook @@ -4,7 +4,7 @@ INFILE=handbook.in OUTFILE=handbook.txt -CRUX_VERSION=2.7 +CRUX_VERSION=2.8 TITLE="HANDBOOK FOR CRUX $CRUX_VERSION" URL="http://crux.nu/Main/Handbook${CRUX_VERSION/\./-}?action=print" diff --git a/doc/handbook/get_wiki_release_notes b/doc/handbook/get_wiki_release_notes index 2f38945..974622a 100755 --- a/doc/handbook/get_wiki_release_notes +++ b/doc/handbook/get_wiki_release_notes @@ -4,7 +4,7 @@ INFILE=releasenotes.in OUTFILE=releasenotes.txt -CRUX_VERSION=2.7.1 +CRUX_VERSION=2.8 URL="http://crux.nu/Main/ReleaseNotes${CRUX_VERSION//\./-}?action=print" set -x diff --git a/initramfs/init b/initramfs/init index 8256273..7fd8641 100755 --- a/initramfs/init +++ b/initramfs/init @@ -36,7 +36,7 @@ echoDone() { # and prepare /newroot for switch_root at the end of the script find_and_mount_media() { echo -e -n " ${BOLD}${BLUE}*${NORM} Creating and mounting tmpfs... " - mkdir -p /.tmpfs/.media + mkdir /.tmpfs mount -t tmpfs tmpfs /.tmpfs checkReturn @@ -118,13 +118,13 @@ find_and_mount_media() { # the media gets unmounted here and remounted after switch_root umount ${MEDIAMNT} - rm -rf ${MEDIAMNT} + rmdir ${MEDIAMNT} sed -i -e "s,#CRUXMEDIA#,${CRUXMEDIA}," /newroot/etc/fstab echo -e -n " ${BOLD}${BLUE}*${NORM} Unmounting tmpfs... " umount /.tmpfs checkReturn - rm -rf /.tmpfs + rmdir /.tmpfs } /bin/busybox --install -s /bin @@ -206,7 +206,7 @@ then gdth hptiop in2000 initio ipr ips lpfc megaraid megaraid_mbox megaraid_sas \ nsp32 pas16 psi240i qla1280 qla2xxx qla4xxx qlogicfas qlogicfas408 seagate \ sim710 stex sym53c416 sym53c8xx t128 tmscsim u14-34f ultrastor \ - wd7000 mptsas mptspi + wd7000 mptsas mptspi hpsa do if [ ! -z "$DEBUG" ] then diff --git a/initramfs/initramfs.lst b/initramfs/initramfs.lst index f05b812..137df75 100644 --- a/initramfs/initramfs.lst +++ b/initramfs/initramfs.lst @@ -82,6 +82,7 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/storage/usb-storage.ko ../ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/usb/storage/usb-libusual.ko ../kernel/linux-#KERNEL_VERSION#/drivers/usb/storage/usb-libusual.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/usbhid/usbhid.ko ../kernel/linux-#KERNEL_VERSION#/drivers/hid/usbhid/usbhid.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/hid.ko ../kernel/linux-#KERNEL_VERSION#/drivers/hid/hid.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/hid/hid-logitech-dj.ko ../kernel/linux-#KERNEL_VERSION#/drivers/hid/hid-logitech-dj.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire/firewire-core.ko ../kernel/linux-#KERNEL_VERSION#/drivers/firewire/firewire-core.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire/firewire-ohci.ko ../kernel/linux-#KERNEL_VERSION#/drivers/firewire/firewire-ohci.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/firewire/firewire-sbp2.ko ../kernel/linux-#KERNEL_VERSION#/drivers/firewire/firewire-sbp2.ko 644 0 0 @@ -167,6 +168,7 @@ file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/dtc.ko ../kernel/linux-#K file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/eata.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/eata.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/fdomain.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/fdomain.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/gdth.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/gdth.ko 644 0 0 +file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/hpsa.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/hpsa.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/hptiop.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/hptiop.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/in2000.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/in2000.ko 644 0 0 file /lib/modules/#KERNEL_VERSION#/kernel/drivers/scsi/initio.ko ../kernel/linux-#KERNEL_VERSION#/drivers/scsi/initio.ko 644 0 0 diff --git a/iso/setup.dependencies b/iso/setup.dependencies index 72a9e54..b67e88e 100644 --- a/iso/setup.dependencies +++ b/iso/setup.dependencies @@ -148,7 +148,7 @@ pango: zlib expat gdbm openssl bzip2 ncurses xorg-xproto libpthread-stubs xorg-x parted: kmod ncurses udev readline libdevmapper parted procmail: procmail python: gdbm openssl bzip2 zlib ncurses readline sqlite3 python -rpcbind: libtirpc rpcbind +rpcbind: libtirpc tcp_wrappers rpcbind rp-pppoe: zlib openssl ppp rp-pppoe sqlite3: ncurses readline sqlite3 syslinux: mtools db gdbm perl syslinux @@ -158,6 +158,7 @@ wpa_supplicant: openssl ncurses libnl readline wpa_supplicant wvdial: zlib openssl ppp wvdial xterm: xorg-xproto gdbm openssl bzip2 zlib ncurses libpthread-stubs xorg-xf86bigfontproto xorg-xextproto xorg-xtrans xorg-util-macros xorg-font-alias xorg-font-util xorg-fontsproto xorg-mkfontdir xorg-libxdmcp xorg-libxau xorg-libfontenc libxml2 freetype readline xorg-libice xorg-kbproto xorg-inputproto libxslt xorg-libxfont sqlite3 xorg-libsm xorg-bdftopcf python xorg-xcb-proto xorg-libxcb xorg-libx11 xorg-libxext xorg-libxt xorg-mkfontscale xorg-libxmu xorg-libxpm xorg-font-misc-misc xorg-libxaw xterm yasm: yasm +glu: libpthread-stubs xorg-libpciaccess xorg-xproto xorg-util-macros xorg-xextproto xorg-dri2proto gdbm openssl bzip2 zlib ncurses xorg-xf86bigfontproto xorg-xtrans xorg-xf86vidmodeproto xorg-fixesproto xorg-damageproto expat libdrm xorg-makedepend xorg-libxdmcp xorg-libxau xorg-glproto xorg-kbproto xorg-inputproto libxml2 readline xorg-libice libxslt sqlite3 xorg-libsm python xorg-xcb-proto talloc libxml2-python xorg-libxcb xorg-libx11 xorg-libxext xorg-libxt xorg-libxfixes xorg-libxxf86vm xorg-libxdamage mesa3d glu libdrm: libpthread-stubs xorg-libpciaccess libdrm libpthread-stubs: libpthread-stubs mesa3d: libpthread-stubs xorg-libpciaccess xorg-xproto xorg-util-macros xorg-xextproto xorg-dri2proto gdbm openssl bzip2 zlib ncurses xorg-xf86bigfontproto xorg-xtrans xorg-xf86vidmodeproto xorg-fixesproto xorg-damageproto expat libdrm xorg-makedepend xorg-libxdmcp xorg-libxau xorg-glproto xorg-kbproto xorg-inputproto libxml2 readline xorg-libice libxslt sqlite3 xorg-libsm python xorg-xcb-proto talloc libxml2-python xorg-libxcb xorg-libx11 xorg-libxext xorg-libxt xorg-libxfixes xorg-libxxf86vm xorg-libxdamage mesa3d diff --git a/kernel/linux-3.5.4.config b/kernel/linux-3.5.4.config index a2b6edf..c9bb198 100644 --- a/kernel/linux-3.5.4.config +++ b/kernel/linux-3.5.4.config @@ -100,7 +100,6 @@ CONFIG_GENERIC_CMOS_UPDATE=y # RCU Subsystem # CONFIG_TREE_RCU=y -# CONFIG_TINY_RCU is not set # CONFIG_PREEMPT_RCU is not set CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 @@ -1863,7 +1862,7 @@ CONFIG_FONT_8x16=y # HID support # CONFIG_HID=m -# CONFIG_HIDRAW is not set +CONFIG_HIDRAW=y CONFIG_HID_GENERIC=m # diff --git a/packages.xorg b/packages.xorg index 569d770..e82ccbf 100644 --- a/packages.xorg +++ b/packages.xorg @@ -1,3 +1,4 @@ +glu libdrm libpthread-stubs mesa3d