From 97b35f8d8495bf9d0d100e5eea14f7b134c5c79c Mon Sep 17 00:00:00 2001 From: Benjamin Schieder Date: Mon, 29 May 2006 07:41:37 +0000 Subject: [PATCH] Benjamin Schieder: updated lvp target (0.5.3) [2006051809291015352] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7599 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/lvp/ChangeLog | 32 ++ target/lvp/build.sh | 21 +- target/lvp/config.in | 8 +- target/lvp/kernel26.conf | 462 +++++++++++++----- target/lvp/parse-config | 2 +- .../findutils_4224_glibc236_static.patch | 13 + target/lvp/patches/xorg_hotfixes.patch | 126 +++-- target/lvp/pkg_findutils.conf | 24 + target/lvp/pkg_mplayer.conf | 2 +- target/lvp/pkg_xorg.conf | 3 + target/lvp/preconfig.in | 3 +- target/lvp/x86/build.sh | 1 + target/lvp/x86/help0.txt | 4 +- target/lvp/x86/initrd/hardware | 17 +- target/lvp/x86/initrd/keymap | 4 +- target/lvp/x86/initrd/linuxrc | 20 +- target/lvp/x86/isolinux.cfg | 6 +- .../x86/livesystem/etc_lvp_10-encryption.sh | 1 + target/lvp/x86/livesystem/linuxrc | 6 +- target/lvp/x86/release_skeleton/ChangeLog | 22 - target/lvp/x86/release_skeleton/README | 3 + target/lvp/x86/release_skeleton/config.sh | 79 ++- .../release_skeleton/scripts/configuration | 6 + .../release_skeleton/scripts/create_lvpxml | 18 +- .../x86/release_skeleton/scripts/encrypted | 37 +- .../x86/release_skeleton/scripts/functions | 6 +- target/lvp/x86/release_skeleton/scripts/plain | 10 +- 27 files changed, 640 insertions(+), 296 deletions(-) create mode 100644 target/lvp/patches/findutils_4224_glibc236_static.patch create mode 100644 target/lvp/pkg_findutils.conf delete mode 100644 target/lvp/x86/release_skeleton/ChangeLog diff --git a/target/lvp/ChangeLog b/target/lvp/ChangeLog index 9d305b540..a85e72f41 100644 --- a/target/lvp/ChangeLog +++ b/target/lvp/ChangeLog @@ -1,4 +1,36 @@ +Mon May 15 10:36:53 CEST 2006 Benjamin Schieder + + * usual package updates (freeglut 2.4.0, udev 090, xorg 6.9.0, ROCK Linux 7368) + * use upx2 for in-memory decompression (now bash and mount are also compressed) + * improved hardware detection through the now almost-sane-again interface udev provides + * feedback option + * check-for-updates option + * V0.5.3: released, dubbed "Naginata" + +Thu Mar 9 07:06:31 CET 2006 Benjamin Schieder + + * isolinux: initrd size is 16 MB, not 8 MB + * V0.5.2.1: released, dubbed "CLT Bug" + +Thu Feb 2 19:59:36 CET 2006 Benjamin Schieder + + * usual round of updates: ROCK 6947 + * udev now expects its stuff in /lib: fixed + * findutils 4.2.26 shares namespace with glibc 2.3.6: fixed + * add a VERSION file to binary releases + * mount devpts + * remove livesystem dependency on cat + * no more error messages when not using encryption + * make author happy menu entry ;) + * fix pseudo-xml output + * check if we can actually use encryption + * passphrase must be *at least* 20 chars, not *more than* + * fix scripts for coreutils-5.93 and beyond + * code cleanup: no more useless negations + * code cleanup: get filesize with stat instead of ls+sed+cut + * V0.5.2: released, dubbed "Go-Kyu" + Tue Nov 15 20:17:48 CET 2005 Benjamin Schieder * removed unnecessary programs from the live system diff --git a/target/lvp/build.sh b/target/lvp/build.sh index 6a4822696..4d00fc650 100644 --- a/target/lvp/build.sh +++ b/target/lvp/build.sh @@ -22,7 +22,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -lvp_ver="0.5.1" +lvp_ver="0.5.3" rootdir="${base}/build/${ROCKCFG_ID}" ROCKdir="${rootdir}/ROCK" releasedir="${ROCKdir}/lvp_${lvp_ver}_${ROCKCFG_X86_OPT}" @@ -65,32 +65,36 @@ else ln -sf . usr cd etc ln -sf /proc/mounts mtab + touch fstab cd .. echo_status "Copying programs" for x in \ bin/bash2 \ bin/bash \ - bin/cat \ + bin/cp \ bin/grep \ bin/gzip \ bin/ln \ - bin/ls \ bin/mount \ - bin/sed \ + bin/mkdir \ bin/umount \ bin/rm \ + bin/sleep \ bin/find \ bin/gawk \ bin/loadkeys \ etc/udev \ lib/modules/${kernelversion}-rock \ + lib/udev \ sbin/agetty \ sbin/hwscan \ sbin/rmmod \ sbin/modprobe \ sbin/insmod \ - sbin/udevstart \ + sbin/udevd \ + sbin/udevtrigger \ + sbin/udevsettle \ usr/bin/chroot \ usr/bin/eject \ usr/bin/lsmod \ @@ -138,6 +142,7 @@ else bin/mount \ bin/rm \ bin/sh \ + bin/sleep \ bin/umount \ etc/mplayer/mplayer.conf \ usr/share/mplayer/font-arial-24-iso-8859-1 \ @@ -146,7 +151,7 @@ else usr/X11/bin/startx \ usr/X11/bin/xauth \ usr/X11/bin/xinit \ - usr/X11/bin/xterm \ + usr/bin/xterm \ usr/X11/lib/X11/fonts/misc \ usr/bin/lvp \ usr/bin/mplayer \ @@ -193,7 +198,7 @@ else echo "LVP v${lvp_ver}" >>${releasedir}/livesystem/etc/VERSION echo_status "Compressing binaries ... " - ${rootdir}/usr/bin/upx --best --crp-ms=999999 --nrv2d `find ${releasedir}/livesystem -type f | xargs file | grep "statically linked" | grep -v bin/bash | grep -v bin/mount | cut -f1 -d:` `find ${releasedir}/initrd -type f | xargs file | grep "statically linked" | grep -v bin/bash | grep -v bin/mount | cut -f1 -d:` >/proc/${$}/fd/1 2>/proc/${$}/fd/2 /proc/${$}/fd/1 2>/proc/${$}/fd/2 /dev/null 2>&1 @@ -202,8 +207,6 @@ else mount -o loop ${releasedir}/isolinux/initrd ${releasedir}/initrd.tmp.${$} mv ${releasedir}/initrd/* ${releasedir}/initrd.tmp.${$} umount ${releasedir}/initrd.tmp.${$} - - echo_status "Compressing initrd ..." gzip -9 ${releasedir}/isolinux/initrd mv ${releasedir}/isolinux/initrd.gz ${releasedir}/isolinux/initrd diff --git a/target/lvp/config.in b/target/lvp/config.in index e8c1e91b5..15f879406 100644 --- a/target/lvp/config.in +++ b/target/lvp/config.in @@ -45,6 +45,7 @@ pkgfilter sed ' / gawk / { p; d; }; / gcc / { p; d; }; / glibc / { p; d; }; +/ gmp / { p; d; }; / grep / { p; d; }; / groff / { p; d; }; / gzip / { p; d; }; @@ -59,12 +60,14 @@ pkgfilter sed ' / libtool / { p; d; }; / libungif / { p; d; }; / linux / { p; d; }; +/ linux-libc-headers / { p; d; }; / lvp / { p; d; }; / m4 / { p; d; }; / make / { p; d; }; / mdadm / { p; d; }; / mktemp / { p; d; }; / module-init-tools / { p; d; }; +/ mpfr / { p; d; }; / mplayer / { p; d; }; / nasm / { p; d; }; / ncurses / { p; d; }; @@ -72,6 +75,7 @@ pkgfilter sed ' / patch / { p; d; }; / pciutils / { p; d; }; / perl5 / { p; d; }; +/ rockinitrd / { p; d; }; / sed / { p; d; }; / sysfiles / { p; d; }; / syslinux / { p; d; }; @@ -80,10 +84,11 @@ pkgfilter sed ' / texinfo / { p; d; }; / udev / { p; d; }; / ucl / { p; d; }; -/ upx / { p; d; }; +/ upx2 / { p; d; }; / util-linux / { p; d; }; / w32codec / { p; d; }; / xorg / { p; d; }; +/ xterm / { p; d; }; / zlib / { p; d; }; # Disable all other packages /.*/ { s/^X /O /p; d; };' @@ -118,4 +123,5 @@ ROCKCFGSET_PKG_BASH_HELP_CMD=0 pkgenable freeglut pkgenable lvp pkgenable bash=bash2 +pkgenable upx2 ROCKCFGSET_DEBUG=0 diff --git a/target/lvp/kernel26.conf b/target/lvp/kernel26.conf index 2d810efef..1f23f6c28 100644 --- a/target/lvp/kernel26.conf +++ b/target/lvp/kernel26.conf @@ -1,19 +1,21 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.12.3-rock -# Sat Oct 8 14:56:37 2005 +# Linux kernel version: 2.6.16.9-rock +# Fri May 12 09:26:00 2006 # +CONFIG_X86_32=y +CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_X86=y CONFIG_MMU=y -CONFIG_UID16=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y # # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -21,30 +23,36 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # General setup # CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y # CONFIG_SWAP is not set CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set -CONFIG_HOTPLUG=y -CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_VM86=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set +CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y +CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_SHMEM is not set CONFIG_CC_ALIGN_FUNCTIONS=0 CONFIG_CC_ALIGN_LABELS=0 CONFIG_CC_ALIGN_LOOPS=0 CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_SLAB=y CONFIG_TINY_SHMEM=y CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set # # Loadable module support @@ -56,6 +64,24 @@ CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_KMOD is not set +# +# Block layer +# +# CONFIG_LBD is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +# CONFIG_IOSCHED_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" + # # Processor type and features # @@ -87,6 +113,7 @@ CONFIG_M686=y # CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set # CONFIG_MGEODEGX1 is not set +# CONFIG_MGEODE_LX is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set # CONFIG_X86_GENERIC is not set @@ -100,13 +127,16 @@ CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y +CONFIG_X86_CMPXCHG64=y CONFIG_X86_GOOD_APIC=y CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_TSC=y # CONFIG_HPET_TIMER is not set # CONFIG_SMP is not set +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set # CONFIG_X86_UP_APIC is not set -CONFIG_X86_TSC=y # CONFIG_X86_MCE is not set # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set @@ -119,30 +149,59 @@ CONFIG_X86_TSC=y # Firmware Drivers # # CONFIG_EDD is not set +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_3G_OPT is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_MATH_EMULATION is not set # CONFIG_MTRR is not set # CONFIG_EFI is not set # CONFIG_REGPARM is not set # CONFIG_SECCOMP is not set +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +# CONFIG_KEXEC is not set +CONFIG_PHYSICAL_START=0x100000 +CONFIG_DOUBLEFAULT=y # # Power management options (ACPI, APM) # -# CONFIG_PM is not set +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set # # ACPI (Advanced Configuration and Power Interface) Support # CONFIG_ACPI=y -CONFIG_ACPI_BOOT=y -CONFIG_ACPI_INTERPRETER=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SLEEP_PROC_FS=y +# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set # CONFIG_ACPI_AC is not set # CONFIG_ACPI_BATTERY is not set # CONFIG_ACPI_BUTTON is not set # CONFIG_ACPI_VIDEO is not set +# CONFIG_ACPI_HOTKEY is not set # CONFIG_ACPI_FAN is not set # CONFIG_ACPI_PROCESSOR is not set # CONFIG_ACPI_ASUS is not set @@ -150,14 +209,24 @@ CONFIG_ACPI_INTERPRETER=y # CONFIG_ACPI_TOSHIBA is not set CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_BUS=y CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y -CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y # CONFIG_X86_PM_TIMER is not set # CONFIG_ACPI_CONTAINER is not set +# +# APM (Advanced Power Management) BIOS Support +# +CONFIG_APM=m +# CONFIG_APM_IGNORE_USER_SUSPEND is not set +# CONFIG_APM_DO_ENABLE is not set +# CONFIG_APM_CPU_IDLE is not set +# CONFIG_APM_DISPLAY_BLANK is not set +# CONFIG_APM_RTC_IS_GMT is not set +# CONFIG_APM_ALLOW_INTS is not set +# CONFIG_APM_REAL_MODE_POWER_OFF is not set + # # CPU Frequency scaling # @@ -176,8 +245,6 @@ CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y # CONFIG_PCIEPORTBUS is not set CONFIG_PCI_LEGACY_PROC=y -CONFIG_PCI_NAMES=y -# CONFIG_PCI_DEBUG is not set CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set @@ -200,6 +267,78 @@ CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +# CONFIG_PACKET is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +# CONFIG_IP_PNP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + # # Device Drivers # @@ -210,7 +349,11 @@ CONFIG_BINFMT_ELF=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m -# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +CONFIG_CONNECTOR=m # # Memory Technology Devices (MTD) @@ -237,24 +380,14 @@ CONFIG_BLK_DEV_FD=y # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -# CONFIG_LBD is not set # CONFIG_CDROM_PKTCDVD is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set # CONFIG_ATA_OVER_ETH is not set # @@ -280,16 +413,54 @@ CONFIG_BLK_DEV_IDECD=y # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=y -# CONFIG_BLK_DEV_CMD640 is not set -# CONFIG_BLK_DEV_IDEPCI is not set +CONFIG_BLK_DEV_CMD640=y +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +CONFIG_BLK_DEV_OFFBOARD=y +CONFIG_BLK_DEV_GENERIC=y +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_RZ1000=y +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +# CONFIG_IDEDMA_PCI_AUTO is not set +CONFIG_BLK_DEV_AEC62XX=m +CONFIG_BLK_DEV_ALI15X3=m +# CONFIG_WDC_ALI15X3 is not set +CONFIG_BLK_DEV_AMD74XX=m +CONFIG_BLK_DEV_ATIIXP=m +CONFIG_BLK_DEV_CMD64X=m +CONFIG_BLK_DEV_TRIFLEX=m +CONFIG_BLK_DEV_CY82C693=m +CONFIG_BLK_DEV_CS5520=m +CONFIG_BLK_DEV_CS5530=m +CONFIG_BLK_DEV_CS5535=m +CONFIG_BLK_DEV_HPT34X=m +# CONFIG_HPT34X_AUTODMA is not set +CONFIG_BLK_DEV_HPT366=m +CONFIG_BLK_DEV_SC1200=m +CONFIG_BLK_DEV_PIIX=m +CONFIG_BLK_DEV_IT821X=m +CONFIG_BLK_DEV_NS87415=m +CONFIG_BLK_DEV_PDC202XX_OLD=m +# CONFIG_PDC202XX_BURST is not set +CONFIG_BLK_DEV_PDC202XX_NEW=m +CONFIG_BLK_DEV_SVWKS=m +CONFIG_BLK_DEV_SIIMAGE=m +CONFIG_BLK_DEV_SIS5513=m +CONFIG_BLK_DEV_SLC90E66=m +CONFIG_BLK_DEV_TRM290=m +CONFIG_BLK_DEV_VIA82CXXX=m # CONFIG_IDE_ARM is not set -# CONFIG_BLK_DEV_IDEDMA is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set # CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set # # SCSI device support # +CONFIG_RAID_ATTRS=m CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set @@ -302,6 +473,7 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set # CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs @@ -316,10 +488,12 @@ CONFIG_BLK_DEV_SR=y # CONFIG_SCSI_SPI_ATTRS is not set CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_ISCSI_ATTRS=m +CONFIG_SCSI_SAS_ATTRS=m # # SCSI low-level drivers # +# CONFIG_ISCSI_TCP is not set # CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_ACARD is not set @@ -330,6 +504,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_DPT_I2O is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set @@ -343,13 +518,8 @@ CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_IPR is not set # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set -CONFIG_SCSI_QLA2XXX=y -# CONFIG_SCSI_QLA21XX is not set -# CONFIG_SCSI_QLA22XX is not set -# CONFIG_SCSI_QLA2300 is not set -# CONFIG_SCSI_QLA2322 is not set -# CONFIG_SCSI_QLA6312 is not set -CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set @@ -379,6 +549,9 @@ CONFIG_DM_CRYPT=m # Fusion MPT device support # # CONFIG_FUSION is not set +# CONFIG_FUSION_SPI is not set +# CONFIG_FUSION_FC is not set +# CONFIG_FUSION_SAS is not set # # IEEE 1394 (FireWire) support @@ -391,47 +564,55 @@ CONFIG_DM_CRYPT=m # CONFIG_I2O is not set # -# Networking support +# Network device support # -CONFIG_NET=y +# CONFIG_NETDEVICES is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set # -# Networking options +# PHY device support # -# CONFIG_PACKET is not set -CONFIG_UNIX=y -# CONFIG_NET_KEY is not set -# CONFIG_INET is not set -# CONFIG_IP_TCPDIAG_IPV6 is not set -# CONFIG_NETFILTER is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set -# CONFIG_WAN_ROUTER is not set # -# QoS and/or fair queueing +# Ethernet (10 or 100Mbit) # -# CONFIG_NET_SCHED is not set -# CONFIG_NET_CLS_ROUTE is not set +# CONFIG_NET_ETHERNET is not set # -# Network testing +# Ethernet (1000 Mbit) # -# CONFIG_NET_PKTGEN is not set +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set + +# +# Ethernet (10000 Mbit) +# +# CONFIG_CHELSIO_T1 is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NET_FC is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set -# CONFIG_HAMRADIO is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -# CONFIG_NETDEVICES is not set # # ISDN subsystem @@ -500,17 +681,12 @@ CONFIG_HW_CONSOLE=y # # Serial drivers # -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_CONSOLE is not set -# CONFIG_SERIAL_8250_ACPI is not set -CONFIG_SERIAL_8250_NR_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250 is not set # # Non-8250 serial port support # -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_JSM=m +# CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -539,6 +715,7 @@ CONFIG_RTC=y # CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_MWAVE is not set +# CONFIG_CS5535_GPIO is not set # CONFIG_RAW_DRIVER is not set # CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set @@ -547,22 +724,39 @@ CONFIG_RTC=y # TPM devices # # CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set # # I2C support # # CONFIG_I2C is not set +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + # # Dallas's 1-wire bus # # CONFIG_W1 is not set +# +# Hardware Monitoring support +# +# CONFIG_HWMON is not set +# CONFIG_HWMON_VID is not set + # # Misc devices # # CONFIG_IBM_ASM is not set +# +# Multimedia Capabilities Port drivers +# + # # Multimedia devices # @@ -571,6 +765,7 @@ CONFIG_RTC=y # # Digital Video Broadcasting Devices # +# CONFIG_DVB is not set # # Graphics support @@ -598,59 +793,54 @@ CONFIG_SOUND=y # Open Sound System # CONFIG_SOUND_PRIME=m +CONFIG_OBSOLETE_OSS_DRIVER=y CONFIG_SOUND_BT878=m CONFIG_SOUND_CMPCI=m # CONFIG_SOUND_CMPCI_FM is not set # CONFIG_SOUND_CMPCI_MIDI is not set -# CONFIG_SOUND_CMPCI_JOYSTICK is not set CONFIG_SOUND_EMU10K1=m # CONFIG_MIDI_EMU10K1 is not set CONFIG_SOUND_FUSION=m -CONFIG_SOUND_CS4281=m -CONFIG_SOUND_ES1370=m -CONFIG_SOUND_ES1371=m -CONFIG_SOUND_ESSSOLO1=m -CONFIG_SOUND_MAESTRO=m -CONFIG_SOUND_MAESTRO3=m +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set CONFIG_SOUND_ICH=m -CONFIG_SOUND_SONICVIBES=m +# CONFIG_SOUND_SONICVIBES is not set CONFIG_SOUND_TRIDENT=m # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set -CONFIG_SOUND_VIA82CXXX=m -# CONFIG_MIDI_VIA82CXXX is not set +# CONFIG_SOUND_VIA82CXXX is not set CONFIG_SOUND_OSS=m # CONFIG_SOUND_TRACEINIT is not set # CONFIG_SOUND_DMAP is not set CONFIG_SOUND_AD1816=m CONFIG_SOUND_AD1889=m -CONFIG_SOUND_SGALAXY=m +# CONFIG_SOUND_SGALAXY is not set CONFIG_SOUND_ADLIB=m CONFIG_SOUND_ACI_MIXER=m -CONFIG_SOUND_CS4232=m -CONFIG_SOUND_SSCAPE=m -CONFIG_SOUND_GUS=m -# CONFIG_SOUND_GUS16 is not set -# CONFIG_SOUND_GUSMAX is not set +# CONFIG_SOUND_CS4232 is not set +# CONFIG_SOUND_SSCAPE is not set +# CONFIG_SOUND_GUS is not set CONFIG_SOUND_VMIDI=m CONFIG_SOUND_TRIX=m CONFIG_SOUND_MSS=m CONFIG_SOUND_MPU401=m -CONFIG_SOUND_NM256=m -CONFIG_SOUND_MAD16=m -# CONFIG_MAD16_OLDCARD is not set +# CONFIG_SOUND_NM256 is not set +# CONFIG_SOUND_MAD16 is not set CONFIG_SOUND_PAS=m CONFIG_SOUND_PSS=m # CONFIG_PSS_MIXER is not set CONFIG_SOUND_SB=m -CONFIG_SOUND_AWE32_SYNTH=m -CONFIG_SOUND_WAVEFRONT=m -CONFIG_SOUND_MAUI=m -CONFIG_SOUND_YM3812=m -CONFIG_SOUND_OPL3SA1=m +# CONFIG_SOUND_AWE32_SYNTH is not set +# CONFIG_SOUND_WAVEFRONT is not set +# CONFIG_SOUND_MAUI is not set +# CONFIG_SOUND_YM3812 is not set +# CONFIG_SOUND_OPL3SA1 is not set CONFIG_SOUND_OPL3SA2=m -CONFIG_SOUND_YMFPCI=m -# CONFIG_SOUND_YMFPCI_LEGACY is not set +# CONFIG_SOUND_YMFPCI is not set CONFIG_SOUND_UART6850=m CONFIG_SOUND_AEDSP16=m # CONFIG_SC6600 is not set @@ -658,10 +848,10 @@ CONFIG_SOUND_AEDSP16=m # CONFIG_AEDSP16_SBPRO is not set # CONFIG_AEDSP16_MPU401 is not set CONFIG_SOUND_KAHLUA=m -CONFIG_SOUND_ALI5455=m -CONFIG_SOUND_FORTE=m -CONFIG_SOUND_RME96XX=m -CONFIG_SOUND_AD1980=m +# CONFIG_SOUND_ALI5455 is not set +# CONFIG_SOUND_FORTE is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_AD1980 is not set # # USB support @@ -670,6 +860,10 @@ CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB is not set +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + # # USB Gadget Support # @@ -685,27 +879,32 @@ CONFIG_USB_ARCH_HAS_OHCI=y # # CONFIG_INFINIBAND is not set +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# +# CONFIG_EDAC is not set + # # File systems # CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT2_FS_SUIDDIR is not set # CONFIG_EXT3_FS is not set -# CONFIG_JBD is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set - -# -# XFS support -# +# CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set +# CONFIG_INOTIFY is not set # CONFIG_QUOTA is not set # CONFIG_DNOTIFY is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set # # CD-ROM/DVD Filesystems @@ -728,14 +927,12 @@ CONFIG_JOLIET=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y -# CONFIG_DEVFS_FS is not set -CONFIG_DEVPTS_FS_XATTR=y -# CONFIG_DEVPTS_FS_SECURITY is not set CONFIG_TMPFS=y -# CONFIG_TMPFS_XATTR is not set # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y +# CONFIG_RELAYFS_FS is not set +# CONFIG_CONFIGFS_FS is not set # # Miscellaneous filesystems @@ -757,6 +954,14 @@ CONFIG_RAMFS=y # # Network File Systems # +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set # # Partition Types @@ -809,32 +1014,20 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_UTF8 is not set # -# Profiling support +# Instrumentation Support # # CONFIG_PROFILING is not set +# CONFIG_KPROBES is not set # # Kernel hacking # # CONFIG_PRINTK_TIME is not set -CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y -CONFIG_LOG_BUF_SHIFT=16 -# CONFIG_SCHEDSTATS is not set -# CONFIG_DEBUG_SLAB is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set -# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 # CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_FS is not set -# CONFIG_FRAME_POINTER is not set -# CONFIG_EARLY_PRINTK is not set -# CONFIG_DEBUG_STACKOVERFLOW is not set -# CONFIG_KPROBES is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_4KSTACKS is not set +CONFIG_EARLY_PRINTK=y # # Security options @@ -846,7 +1039,7 @@ CONFIG_LOG_BUF_SHIFT=16 # Cryptographic options # CONFIG_CRYPTO=y -# CONFIG_CRYPTO_HMAC is not set +CONFIG_CRYPTO_HMAC=y # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set @@ -859,6 +1052,7 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES_586=m # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set @@ -879,9 +1073,11 @@ CONFIG_CRYPTO_AES_586=m # # Library routines # -# CONFIG_CRC_CCITT is not set -# CONFIG_CRC32 is not set -# CONFIG_LIBCRC32C is not set +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC32=m +CONFIG_LIBCRC32C=m CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_X86_BIOS_REBOOT=y +CONFIG_KTIME_SCALAR=y diff --git a/target/lvp/parse-config b/target/lvp/parse-config index 4c5b195fd..bae3be8b0 100644 --- a/target/lvp/parse-config +++ b/target/lvp/parse-config @@ -22,7 +22,7 @@ static=0 -for x in xorg udev device-mapper upx gzip sed kbd mplayer pciutils grep coreutils libgli lvp gawk findutils eject xfree86 flex module-init-tools strace gdb ; do +for x in xorg udev device-mapper upx gzip sed kbd mplayer pciutils grep coreutils libgli lvp gawk findutils eject xfree86 flex module-init-tools strace gdb xterm ; do [ "${pkg}" == "${x}" ] && static=1 done diff --git a/target/lvp/patches/findutils_4224_glibc236_static.patch b/target/lvp/patches/findutils_4224_glibc236_static.patch new file mode 100644 index 000000000..1f47022fe --- /dev/null +++ b/target/lvp/patches/findutils_4224_glibc236_static.patch @@ -0,0 +1,13 @@ +diff -pruN findutils-4.2.24-orig/gnulib/lib/regex.h findutils-4.2.24/gnulib/lib/regex.h +--- findutils-4.2.24-orig/gnulib/lib/regex.h 2006-01-31 09:34:31.000000000 +0100 ++++ findutils-4.2.24/gnulib/lib/regex.h 2006-01-31 09:34:54.000000000 +0100 +@@ -21,6 +21,9 @@ + #ifndef _REGEX_H + #define _REGEX_H 1 + ++#define __re_error_msgid __findutils__re_error_msgid ++#define __re_error_msgid_idx __findutils__re_error_msgid_idx ++ + #include + + /* Allow the use in C++ code. */ diff --git a/target/lvp/patches/xorg_hotfixes.patch b/target/lvp/patches/xorg_hotfixes.patch index 5f680ba8d..da8e710a1 100644 --- a/target/lvp/patches/xorg_hotfixes.patch +++ b/target/lvp/patches/xorg_hotfixes.patch @@ -1,24 +1,6 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/target/lvp/patches/xorg_hotfixes.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h 2005-01-16 17:40:50.170615424 +0100 -+++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h 2005-01-16 17:40:57.856447000 +0100 +diff -pruN xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h xc-patch/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h +--- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h 2004-04-23 20:42:55.000000000 +0200 ++++ xc-patch/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h 2006-03-29 12:56:15.000000000 +0200 @@ -66,8 +66,8 @@ extern "C" float floorf(float); #define NEEDCEILF #endif @@ -30,41 +12,9 @@ #endif #ifdef LIBRARYBUILD ---- xc/programs/glxinfo/Imakefile 2004-04-23 21:54:33.000000000 +0200 -+++ xc/programs/glxinfo/Imakefile 2005-01-17 10:53:13.084953608 +0100 -@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/programs/glxinfo/Imak - #if BuildGLULibrary - - DEPLIBS = $(DEPGLULIB) $(DEPGLXLIB) $(DEPXLIB) --LOCAL_LIBRARIES = $(GLULIB) $(GLXLIB) $(XLIB) -+LOCAL_LIBRARIES = $(GLULIB) $(GLXLIB) $(XLIB) -ldl -lXxf86vm - DEFINES = -DDO_GLU - - #else ---- xc/programs/glxgears/Imakefile 2004-09-02 07:50:38.000000000 +0200 -+++ xc/programs/glxgears/Imakefile 2005-01-17 11:39:49.878776320 +0100 -@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/programs/glxinfo/Imak - #endif - - DEPLIBS = $(DEPGLXLIB) $(DEPXPLIB) $(DEPXLIB) --LOCAL_LIBRARIES = $(GLXLIB) $(XPRINTLIBS) $(XLIB) -+LOCAL_LIBRARIES = $(GLXLIB) $(XPRINTLIBS) $(XLIB) -ldl -lXxf86vm - DEFINES = $(XPRINTDEFINES) - SYS_LIBRARIES = MathLibrary - ---- xc/programs/xdriinfo/Imakefile 2005-01-18 10:16:29.014022152 +0100 -+++ xc/programs/xdriinfo/Imakefile 2005-01-18 10:16:37.274766328 +0100 -@@ -4,7 +4,7 @@ XCOMM $XFree86$ - - SRCS = xdriinfo.c - OBJS = xdriinfo.o -- LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) -+ LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) -ldl -lXxf86vm - DEPLIBS = - - AllTarget(ProgramTargetName(xdriinfo)) ---- xc/fonts/util/ucs2any.c 2004-08-26 13:58:06.000000000 +0200 -+++ xc/fonts/util/ucs2any.c 2005-01-18 12:19:47.123338584 +0100 +diff -pruN xc/fonts/util/ucs2any.c xc-patch/fonts/util/ucs2any.c +--- xc/fonts/util/ucs2any.c 2004-11-28 20:06:20.000000000 +0100 ++++ xc-patch/fonts/util/ucs2any.c 2006-03-29 12:56:15.000000000 +0200 @@ -61,7 +61,7 @@ /* global variable for argv[0] */ const char *my_name = NULL; @@ -74,9 +24,10 @@ static char * basename(char *pathname) { ---- xc/programs/fc-list/Imakefile 2005-01-18 14:02:56.000000000 +0100 -+++ xc/programs/fc-list/Imakefile 2005-01-18 15:15:48.274799520 +0100 -@@ -4,8 +4,8 @@ FONTCONFIGDIR = $(TOP)/extras/fontconfig +diff -pruN xc/programs/fc-list/Imakefile xc-patch/programs/fc-list/Imakefile +--- xc/programs/fc-list/Imakefile 2005-06-29 23:51:13.000000000 +0200 ++++ xc-patch/programs/fc-list/Imakefile 2006-03-29 12:56:15.000000000 +0200 +@@ -13,8 +13,8 @@ FONTCONFIGDIR = $(TOP)/extras/fontconfig INCLUDES=$(FREETYPE2INCLUDES) -I$(FONTCONFIGDIR) @@ -87,8 +38,33 @@ SRCS=fc-list.c OBJS=fc-list.o ---- xc/programs/x11perf/Imakefile 2005-01-18 13:22:58.000000000 +0100 -+++ xc/programs/x11perf/Imakefile 2005-01-18 16:13:52.097178016 +0100 +diff -pruN xc/programs/glxgears/Imakefile xc-patch/programs/glxgears/Imakefile +--- xc/programs/glxgears/Imakefile 2004-11-01 02:54:21.000000000 +0100 ++++ xc-patch/programs/glxgears/Imakefile 2006-03-29 12:56:15.000000000 +0200 +@@ -12,7 +12,7 @@ XCOMM $XFree86: xc/programs/glxinfo/Imak + #endif + + DEPLIBS = $(DEPGLXLIB) $(DEPXPLIB) $(DEPXLIB) +-LOCAL_LIBRARIES = $(GLXLIB) $(XPRINTLIBS) $(XLIB) ++LOCAL_LIBRARIES = $(GLXLIB) $(XPRINTLIBS) $(XLIB) -ldl -lXxf86vm + DEFINES = $(XPRINTDEFINES) + SYS_LIBRARIES = MathLibrary $(RTLIB) + +diff -pruN xc/programs/glxinfo/Imakefile xc-patch/programs/glxinfo/Imakefile +--- xc/programs/glxinfo/Imakefile 2004-12-02 12:09:30.000000000 +0100 ++++ xc-patch/programs/glxinfo/Imakefile 2006-03-29 12:56:15.000000000 +0200 +@@ -5,7 +5,7 @@ XCOMM $XFree86: xc/programs/glxinfo/Imak + #if BuildGLULibrary + + DEPLIBS = $(DEPGLULIB) $(DEPGLXLIB) $(DEPXLIB) +-LOCAL_LIBRARIES = $(GLULIB) $(GLXLIB) $(XLIB) ++LOCAL_LIBRARIES = $(GLULIB) $(GLXLIB) $(XLIB) -ldl -lXxf86vm + DEFINES = -DDO_GLU + + #else +diff -pruN xc/programs/x11perf/Imakefile xc-patch/programs/x11perf/Imakefile +--- xc/programs/x11perf/Imakefile 2004-08-11 10:05:31.000000000 +0200 ++++ xc-patch/programs/x11perf/Imakefile 2006-03-29 12:56:15.000000000 +0200 @@ -40,7 +40,7 @@ XCOMM $XFree86: xc/programs/x11perf/Imak do_dots.o do_windows.o do_movewin.o do_text.o \ do_blt.o do_arcs.o \ @@ -98,19 +74,33 @@ DEPLIBS = $(XFTDEPS) $(XRENDERDEPS) $(DEPXMUULIB) $(DEPXLIB) SYS_LIBRARIES = MathLibrary ---- xc/programs/xclock/Imakefile 2005-01-19 10:15:42.031830344 +0100 -+++ xc/programs/xclock/Imakefile 2005-01-19 10:16:01.127927296 +0100 -@@ -15,7 +15,7 @@ XCOMM $XFree86: xc/programs/xclock/Imake - XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES) -I$(XBUILDINCDIR) +diff -pruN xc/programs/xclock/Imakefile xc-patch/programs/xclock/Imakefile +--- xc/programs/xclock/Imakefile 2004-10-30 22:33:44.000000000 +0200 ++++ xc-patch/programs/xclock/Imakefile 2006-03-29 12:56:39.000000000 +0200 +@@ -18,7 +18,7 @@ XCOMM $XFree86: xc/programs/xclock/Imake + STRLCATDEF = -DHAS_STRLCAT #endif DEPLIBS = $(XRENDERDEPS) XkbClientDepLibs XawClientDepLibs --LOCAL_LIBRARIES = $(XRENDERLIBS) XkbClientLibs XawClientLibs -+LOCAL_LIBRARIES = $(XRENDERLIBS) XkbClientLibs XawClientLibs -lz +-LOCAL_LIBRARIES = $(XRENDERLIBS) XkbClientLibs XawClientLibs $(XPMLIB) ++LOCAL_LIBRARIES = $(XRENDERLIBS) XkbClientLibs XawClientLibs $(XPMLIB) -lz SRCS = xclock.c Clock.c OBJS = xclock.o Clock.o HEADERS = ClockP.h Clock.h +diff -pruN xc/programs/xdriinfo/Imakefile xc-patch/programs/xdriinfo/Imakefile +--- xc/programs/xdriinfo/Imakefile 2004-08-27 21:27:12.000000000 +0200 ++++ xc-patch/programs/xdriinfo/Imakefile 2006-03-29 12:56:15.000000000 +0200 +@@ -4,7 +4,7 @@ XCOMM $XFree86$ + + SRCS = xdriinfo.c + OBJS = xdriinfo.o +- LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) ++ LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) -ldl -lXxf86vm + DEPLIBS = + + AllTarget(ProgramTargetName(xdriinfo)) +diff -pruN xc/programs/xfd/Imakefile xc-patch/programs/xfd/Imakefile --- xc/programs/xfd/Imakefile 2004-04-23 21:54:47.000000000 +0200 -+++ xc/programs/xfd/Imakefile 2005-01-19 12:19:14.690934872 +0100 ++++ xc-patch/programs/xfd/Imakefile 2006-03-29 12:56:15.000000000 +0200 @@ -15,7 +15,7 @@ XCOMM $XFree86: xc/programs/xfd/Imakefil XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES) -I$(XBUILDINCDIR) #endif diff --git a/target/lvp/pkg_findutils.conf b/target/lvp/pkg_findutils.conf new file mode 100644 index 000000000..243e9f9ec --- /dev/null +++ b/target/lvp/pkg_findutils.conf @@ -0,0 +1,24 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/target/lvp/pkg_freetype.conf +# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +# +# 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 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- +[ -e ${confdir}/${pkg}.conf ] && . ${confdir}/${pkg}.conf + +var_append patchfiles " " "${targetdir}/patches/findutils_4224_glibc236_static.patch" diff --git a/target/lvp/pkg_mplayer.conf b/target/lvp/pkg_mplayer.conf index d956cad7e..2566f93d8 100644 --- a/target/lvp/pkg_mplayer.conf +++ b/target/lvp/pkg_mplayer.conf @@ -21,7 +21,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- [ -e ${confdir}/${pkg}.conf ] && . ${confdir}/${pkg}.conf -var_append confopt " " "--enable-static --disable-shared-pp" +#var_append confopt " " "--enable-static --disable-shared-pp" var_remove confopt " " "--enable-fbdev" var_remove confopt " " "--enable-shared-pp" diff --git a/target/lvp/pkg_xorg.conf b/target/lvp/pkg_xorg.conf index f51c703e3..49256e0ca 100644 --- a/target/lvp/pkg_xorg.conf +++ b/target/lvp/pkg_xorg.conf @@ -48,6 +48,9 @@ EOT /* do not install duplicate crap in /etc/X11 */ #define UseSeparateConfDir NO +/* do not use Joystick support */ +#define JoystickSupport NO + /* build statically */ #define DoLoadableServer NO #define ForceNormalLib YES diff --git a/target/lvp/preconfig.in b/target/lvp/preconfig.in index 8ec2f6c92..32b226594 100644 --- a/target/lvp/preconfig.in +++ b/target/lvp/preconfig.in @@ -20,5 +20,4 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -CFGTEMP_TARGETLIST="${CFGTEMP_TARGETLIST} ` -`lvp LVP" +CFGTEMP_TARGETLIST="${CFGTEMP_TARGETLIST} lvp LVP" diff --git a/target/lvp/x86/build.sh b/target/lvp/x86/build.sh index 82cbaac71..91cc83eb3 100644 --- a/target/lvp/x86/build.sh +++ b/target/lvp/x86/build.sh @@ -51,6 +51,7 @@ case "${ROCKCFG_X86_OPT}" in esac sed -i -e "s,COMPILEDFOR,${opt_text},g" README +echo "LVP Version ${lvp_ver}" > VERSION find ${releasedir} -name .svn -exec rm -rf {} \; 2>/dev/null diff --git a/target/lvp/x86/help0.txt b/target/lvp/x86/help0.txt index 9e23d7bac..7c7200daa 100644 --- a/target/lvp/x86/help0.txt +++ b/target/lvp/x86/help0.txt @@ -5,17 +5,17 @@ | / /__| |/ / ____/ | | /_____/___/_/ | | [===================================================================] | -| V 0.5.1 "100% XCP free" | +| V 0.5.3 "Naginata" | | | | Kernel Images: | | lvp Start LVP | | | | Options: | | keymap= specify keymap to load (de, us, dvorak, ...) | -| oldxconfig Use old (LVP <= 0.2.2) X-Configuration | | debug print kernel-messages | | | | | | | | | +| | +---------------------------------------------------------------------------+ diff --git a/target/lvp/x86/initrd/hardware b/target/lvp/x86/initrd/hardware index ae4aeac4a..2f7f22fc9 100644 --- a/target/lvp/x86/initrd/hardware +++ b/target/lvp/x86/initrd/hardware @@ -21,15 +21,11 @@ # file for details. # # --- ROCK-COPYRIGHT-NOTE-END --- -echo "Running udevstart to get /dev started ... " +echo "Populating /dev ... " -/sbin/udevstart -cd /dev ; rm -f fd -ln -sf /proc/kcore core -ln -sf /proc/self/fd fd -ln -sf fd/0 stdin -ln -sf fd/1 stdout -ln -sf fd/2 stderr +cp -r /lib/udev/devices/* /dev +mount -t devpts devpts /dev/pts +cd /dev ln -sf misc/psaux mouse cd / @@ -46,7 +42,10 @@ if [ `grep -c '^# ' /tmp/hardware` -gt 0 ] ; then . /tmp/hardware fi -/sbin/udevstart +echo "" > /proc/sys/kernel/hotplug +/sbin/udevd --daemon +/sbin/udevtrigger +/sbin/udevsettle if [ ! -e /dev/sound/dsp ] ; then echo 'EEP! We have no sound!' diff --git a/target/lvp/x86/initrd/keymap b/target/lvp/x86/initrd/keymap index 57eb6178b..6c268fc98 100644 --- a/target/lvp/x86/initrd/keymap +++ b/target/lvp/x86/initrd/keymap @@ -21,7 +21,9 @@ # file for details. # # --- ROCK-COPYRIGHT-NOTE-END --- -for x in `cat /proc/cmdline` ; do + +read args < /proc/cmdline +for x in ${args} ; do if [[ ${x} = *keymap* ]] ; then keymap=`find /usr/share/kbd/keymaps -name "${x##*=}.map*" 2>/dev/null` if [ -f "${keymap}" ] ; then diff --git a/target/lvp/x86/initrd/linuxrc b/target/lvp/x86/initrd/linuxrc index 35e9d8024..1e9d0c808 100644 --- a/target/lvp/x86/initrd/linuxrc +++ b/target/lvp/x86/initrd/linuxrc @@ -39,16 +39,14 @@ mount -n -t ramfs devfs /dev exec < /dev/console > /dev/console 2> /dev/console ; cd / -cat << EOF - _ __ __ __ __ _ ______ -| | / /__ / /________ ____ ___ ___ / /_____ / /| | / / __ \\ -| | /| / / _ \/ / ___/ __ \/ __ \`__ \/ _ \ / __/ __ \ / / | | / / /_/ / -| |/ |/ / __/ / /__/ /_/ / / / / / / __/ / /_/ /_/ / / /__| |/ / ____/ -|__/|__/\___/_/\___/\____/_/ /_/ /_/\___/ \__/\____/ /_____/___/_/ - -A lot of fun wishes: -The LVP Team: - -Benjamin 'blindcoder' Schieder -EOF +echo " _ __ __ __ __ _ ______" +echo "| | / /__ / /________ ____ ___ ___ / /_____ / /| | / / __ \\" +echo "| | /| / / _ \/ / ___/ __ \/ __ \`__ \/ _ \ / __/ __ \ / / | | / / /_/ /" +echo "| |/ |/ / __/ / /__/ /_/ / / / / / / __/ / /_/ /_/ / / /__| |/ / ____/" +echo "|__/|__/\___/_/\___/\____/_/ /_/ /_/\___/ \__/\____/ /_____/___/_/" +echo "" +echo "A lot of fun wishes:" +echo "The LVP Team:" +echo " -Benjamin 'blindcoder' Schieder" agetty -i 38400 vc/1 -n -l /bin/linuxrc2 diff --git a/target/lvp/x86/isolinux.cfg b/target/lvp/x86/isolinux.cfg index 2eeb50212..0d6a84887 100644 --- a/target/lvp/x86/isolinux.cfg +++ b/target/lvp/x86/isolinux.cfg @@ -7,10 +7,10 @@ DISPLAY help0.txt LABEL lvp kernel vmlinuz - APPEND root=/dev/ram devfs=nocompat initrd=initrd init=/linuxrc rw quiet ramdisk_size=16384 + APPEND root=/dev/ram initrd=initrd init=/linuxrc rw quiet ramdisk_size=16384 LABEL dvorak kernel vmlinuz - APPEND root=/dev/ram devfs=nocompat initrd=initrd init=/linuxrc rw quiet keymap=dvorak ramdisk_size=16384 + APPEND root=/dev/ram initrd=initrd init=/linuxrc rw quiet keymap=dvorak ramdisk_size=16384 LABEL de kernel vmlinuz - APPEND root=/dev/ram devfs=nocompat initrd=initrd init=/linuxrc rw quiet keymap=de-latin1-nodeadkeys ramdisk_size=16384 + APPEND root=/dev/ram initrd=initrd init=/linuxrc rw quiet keymap=de-latin1-nodeadkeys ramdisk_size=16384 diff --git a/target/lvp/x86/livesystem/etc_lvp_10-encryption.sh b/target/lvp/x86/livesystem/etc_lvp_10-encryption.sh index 5ddd985ff..695d93121 100644 --- a/target/lvp/x86/livesystem/etc_lvp_10-encryption.sh +++ b/target/lvp/x86/livesystem/etc_lvp_10-encryption.sh @@ -57,6 +57,7 @@ encryption_start() { } encryption_stop(){ + [ -e /lvp.data1 ] || return umount /mnt1 dmsetup remove /dev/mapper/lvp_data mdadm -S /dev/md/0 diff --git a/target/lvp/x86/livesystem/linuxrc b/target/lvp/x86/livesystem/linuxrc index 87ad438cc..3b469c350 100644 --- a/target/lvp/x86/livesystem/linuxrc +++ b/target/lvp/x86/livesystem/linuxrc @@ -21,9 +21,9 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -mount -t proc proc /proc -mount -t tmpfs tmpfs /tmp -mount -t devpts devpts /dev/pts +mount -t proc none /proc +mount -t tmpfs none /tmp +mount -t devpts none /dev/pts cd /dev ; rm -f fd ln -sf /proc/kcore core diff --git a/target/lvp/x86/release_skeleton/ChangeLog b/target/lvp/x86/release_skeleton/ChangeLog deleted file mode 100644 index 542c3d3e6..000000000 --- a/target/lvp/x86/release_skeleton/ChangeLog +++ /dev/null @@ -1,22 +0,0 @@ -binary_release 0.4.2 - -Benjamin Schieder: - * we now use a linear RAID for better disc usage - * add detection of more than one title per LVP - -binary_release 0.3.0-1 - binary_release 0.4.0 - -Benjamin Schieder: - * implement a userfriendly UI - -binary_release 0.3.0 - binary_release 0.3.0-1 - -Benjamin Schieder: - * fixed wrong substitution in encryption module - * fixed a bug that caused parameters to submodules - (like -source for encryption module) not to work - * changed default entropy-source for encryption to /dev/random - * error-handling for mutually exclusive -file and -files - * increased safety margin for DVDs from one to three MB - * removed non-working kernelparameter from isolinux helptext - * internal code cleanups diff --git a/target/lvp/x86/release_skeleton/README b/target/lvp/x86/release_skeleton/README index ab1b5e168..41a35ed35 100644 --- a/target/lvp/x86/release_skeleton/README +++ b/target/lvp/x86/release_skeleton/README @@ -14,3 +14,6 @@ This binary was compiled COMPILEDFOR. Have a lot of fun, blindy. + +Need more information? + http://lvp.crash-override.net/ diff --git a/target/lvp/x86/release_skeleton/config.sh b/target/lvp/x86/release_skeleton/config.sh index ea3dccd2f..9f6df5773 100644 --- a/target/lvp/x86/release_skeleton/config.sh +++ b/target/lvp/x86/release_skeleton/config.sh @@ -24,8 +24,11 @@ . scripts/functions [ -e .config ] && . .config +read a b lvp_ver < VERSION +oldcount=${LVP_COUNTME:-0} quit=0 + while [ "${quit}" == "0" ] ; do menu_init . scripts/configuration @@ -45,6 +48,21 @@ while [ "${quit}" == "0" ] ; do c) save scripts/create_lvp + if [ ${LVP_COUNTME} -eq 1 ] ; then + read id a < <( ( cpuid 2>/dev/null ; hostid 2>/dev/null ; cat /etc/passwd ) | md5sum ) + program="`which curl`" + if [ -z "${program}" ] ; then + program="`which wget`" + if [ -z "${program}" ] ; then + echo "Can't find either curl or wget. Not counting this disk." + else + program="${program} -O - -o /dev/null http://lvp.crash-override.net/count.php?id=${id}" + fi + else + program="${program} http://lvp.crash-override.net/count.php?id=${id} 2>/dev/null" + fi + ${program} + fi read -p "Press -- to continue" ;; x) @@ -84,11 +102,70 @@ POSSIBILITY OF SUCH DAMAGES. ;; L) clear - more COPYING || cat COPYING + more=$( which more ) + ${more:-cat} COPYING + read -p "Press -- to continue" + ;; + m) + clear + cat <<-EOF +If you want to make the author of this software happy, drop him a line: + blindcoder@scavenger.homeip.net + +Or support him: + http://lvp.crash-override.net/support.html + +Either way, you'll make a simple programmer very happy :-) + + EOF + read -p "Press -- to continue" + ;; + u) + program="`which curl`" + if [ -z "${program}" ] ; then + program="`which wget`" + if [ -z "${program}" ] ; then + echo "Can't find either curl or wget. Please check" + echo + echo " http://lvp.crash-override.net/latest.txt" + echo + echo "manually for an update." + else + program="${program} -O - http://lvp.crash-override.net/latest.txt" + fi + else + program="${program} http://lvp.crash-override.net/latest.txt" + fi + read new_ver url < <( ${program} 2>/dev/null ) + if [ "${lvp_ver}" != "${new_ver}" ] ; then + echo "New version LVP V${new_ver} is available! Download it at" + echo "${url}" + echo + else + echo "You already have the latest version." + echo + fi read -p "Press -- to continue" ;; *) get ${choice} + if [ "${LVP_COUNTME}" == "1" -a "${oldcount}" == "0" ] ; then + read id a < <( ( cpuid 2>/dev/null ; hostid 2>/dev/null ; cat /etc/passwd ) | md5sum ) + cat <<-EOF +Thank you for deciding to have your disks counted! +To prevent abuse of the counter a semi-unique ID is sent to the server +when counting. Your ID is this: + + ${id} + + EOF + olddefault=${LVP_USE_DEFAULTS} + LVP_USE_DEFAULTS=0 + confirm "Do you really want to do this" + [ ${?} -eq 1 ] && LVP_COUNTME=0 + LVP_USE_DEFAULTS=${olddefault} + fi + oldcount=${LVP_COUNTME} ;; esac done diff --git a/target/lvp/x86/release_skeleton/scripts/configuration b/target/lvp/x86/release_skeleton/scripts/configuration index 2e1720579..8a2340025 100644 --- a/target/lvp/x86/release_skeleton/scripts/configuration +++ b/target/lvp/x86/release_skeleton/scripts/configuration @@ -38,6 +38,10 @@ text LVP_FILES "" "Files to put on this medium" bool LVP_USE_MULTI_LANGUAGE 0 "Query for different language settings for .ogm and .mkv files" bool LVP_USE_DEFAULTS 1 "Batch mode (assume default answer to everything)" +comment "" + +bool LVP_COUNTME 0 "Count my disks at lvp.crash-override.net" + comment "" comment "s - Save Configuration" comment "l - Load Configuration" @@ -48,5 +52,7 @@ comment "x - Clean up" comment "---" comment "w - Warranty disclaimer" comment "L - License information" +comment "u - Check for Update" +comment "m - Make Author Happy" comment "" comment "q - Quit" diff --git a/target/lvp/x86/release_skeleton/scripts/create_lvpxml b/target/lvp/x86/release_skeleton/scripts/create_lvpxml index 374660c2a..2436b9801 100644 --- a/target/lvp/x86/release_skeleton/scripts/create_lvpxml +++ b/target/lvp/x86/release_skeleton/scripts/create_lvpxml @@ -34,8 +34,8 @@ create_thumbnail() { mplayer -nosound -vo png -ss $time -frames 2 "livesystem/$file" >/dev/null 2>&1 orig="00000002.png" - [ ! -f "${orig}" ] && orig="00000001.png" - [ ! -f "${orig}" ] && return 1 + [ -f "${orig}" ] || orig="00000001.png" + [ -f "${orig}" ] || return 1 convert -resize '128x128!' ${orig} SGI:$tmp convert -depth 8 -size 128x128 SGI:$tmp gray:$tmp.tmp convert -depth 8 -size 128x128 gray:$tmp.tmp SGI:$tmp.gray @@ -55,10 +55,12 @@ process_create_lvpxml() { for x in ${!file_*} ; do [ -z "${files}" ] || files="${files}\n" - files="${files}${x}" # note: we're not dereferencing the variables here to keep the order the user specified + files="${files}${x}" +# note: we're not dereferencing the variables here to keep the order +# the user specified them in done - files=`echo -e ${files} | sort` + files=`echo -e ${files}` rm -f ${lvpxml} touch ${lvpxml} @@ -82,8 +84,8 @@ process_create_lvpxml() { [ -z "${tmp}" ] || title="${tmp}" cat >> ${lvpxml} <<-EOF - - + + ${title} EOF @@ -117,7 +119,7 @@ process_create_lvpxml() { - ${button_text} @@ -157,7 +159,7 @@ process_create_lvpxml() { echo "done creating lvp.xml file" echo "Please check that the file is correct!" - if [ ! -z ${DISPLAY} ] ; then + if [ -n "${DISPLAY}" ] ; then echo "Trying to show menu now on ${DISPLAY}" lvp=`which lvp` [ -z "${lvp}" ] && lvp="livesystem/usr/bin/lvp" diff --git a/target/lvp/x86/release_skeleton/scripts/encrypted b/target/lvp/x86/release_skeleton/scripts/encrypted index 84c275b5e..ab61a0caa 100644 --- a/target/lvp/x86/release_skeleton/scripts/encrypted +++ b/target/lvp/x86/release_skeleton/scripts/encrypted @@ -35,12 +35,22 @@ process_encrypted(){ echo "available disk space more efficiently." exit 1 fi + modprobe dm_mod 2>/dev/null + modprobe dm_crypt 2>/dev/null + modprobe aes_i586 2>/dev/null + if [ ! -c /dev/mapper/control ] || ! grep -q aes /proc/crypto ; then + echo "There seems to be a problem with your crypto support." + echo "Please make sure that you have both the device mapper" + echo "and its crypto support running as well as support for" + echo "the aes cipher." + exit 1 + fi echo -n "Checking necessary filesystem size ... " filesize=0 while read file ; do - [ ! -f "${file}" ] && continue + [ -f "${file}" ] || continue thisfilesize=`ls -l "${file}" | sed 's,[ \t][ \t]*, ,g' | cut -f5 -d' '` filesize=$(( ${filesize} + ${thisfilesize} )) done < ${moviefiles} @@ -73,8 +83,8 @@ process_encrypted(){ for loopdevice in /dev/loop/* ; do [ ${needed_loopdevices} -eq 0 ] && continue if losetup ${loopdevice} ${moviefiles} 2>/dev/null ; then - # I reuse the ${moviefiles} tmpfile here since associating it - # with a loopdevice doesn't do any harm + # I reuse the ${moviefiles} tmpfile here since + # associating it with a loopdevice doesn't do any harm echo "Using ${loopdevice}" eval "loopdevice_${needed_loopdevices}=\"${loopdevice}\"" losetup -d ${loopdevice} @@ -85,8 +95,8 @@ process_encrypted(){ if [ ${needed_loopdevices} -gt 0 ] ; then echo "Not enough free loop-devices found!" echo "Please either free ${needed_loopdevices} more loop-devices" - echo "(check with losetup -a) or increase the" - echo "number of available loop-devices." + echo "(check with losetup ) or increase the" + echo "number of available loop-devices in your kernel." exit 1 fi @@ -119,7 +129,7 @@ process_encrypted(){ fi if [ -f ${file} ] ; then - thisfilesize=`ls -l "${file}" | sed 's, *, ,g' | cut -f5 -d' '` + thisfilesize=`stat -c %s "${file}"` if [ ${thisfilesize} -eq ${size} ] ; then echo "lvp.data${filesystem} already exists and has correct filesize. Using it." else @@ -141,7 +151,7 @@ process_encrypted(){ while [ "${passphrase}" != "${passphrase_confirm}" ] ; do read -p "Enter passphrase: " -s passphrase echo - if [ "${passphrase:20}" = "" ] ; then + if [ "${passphrase:19}" = "" ] ; then echo "The Passphrase must be at least 20 characters!" passphrase="MEEP" passphrase_confirm="MOOP" @@ -168,8 +178,8 @@ process_encrypted(){ echo "Setting up linear device" mddev="" for x in /dev/md/* ; do - [ ! -z "${mddev}" ] && break - [ `mdadm --misc -Q ${x} | grep -c "not active"` -eq 1 ] && mddev="${x}" + [ -n "${mddev}" ] && break + mdadm --misc -Q ${x} | grep -q "not active" && mddev="${x}" done mdloopdevs="" lvpdata=1 @@ -192,14 +202,15 @@ process_encrypted(){ continue=0 while read file ; do - [ ! -f "${file}" ] && continue + [ -f "${file}" ] || continue [ ${continue} -eq 1 ] && break unset targetdir - thisfile=`ls -l "${file}" | sed 's, *, ,g' | cut -f5 -d' '` - for dir in ${target}/mnt? ; do # I leave this here for historical reasons, maybe we need it again some day + thisfile=`stat -c %s "${file}"` + for dir in ${target}/mnt? ; do +# I leave this here for historical reasons, maybe we need it again some day avail=`df -P ${dir} | grep / | sed 's, *, ,g' | cut -f4 -d' '` - avail=$(( ${avail} * 1024 )) + avail=$(( ${avail%K} * 1024 )) [ -z "${targetdir}" -a ${avail} -gt ${thisfile} ] && targetdir=${dir} done diff --git a/target/lvp/x86/release_skeleton/scripts/functions b/target/lvp/x86/release_skeleton/scripts/functions index 19c64a708..c99c8aed5 100644 --- a/target/lvp/x86/release_skeleton/scripts/functions +++ b/target/lvp/x86/release_skeleton/scripts/functions @@ -133,7 +133,7 @@ multi () { eval "text_${items}=\"${3}\"" shift; shift; shift eval "values_${items}=\"\"" - while [ ! -z "${1}" ] ; do + while [ -n "${1}" ] ; do eval "values_${items}=\"\${values_${items}} ${1}\"" shift done @@ -181,7 +181,7 @@ display () { eval "option=\${option_${i}}" eval "value=\${${option}}" dots="..." - [ "${value:0:17}" == "${value}" ] && dots="" + [ "${value:0:20}" == "${value}" ] && dots="" eval "echo \"${i} - (${value:0:17}${dots}) \${text_${i}}\"" ;; comment) @@ -237,7 +237,7 @@ get () { text) eval "value=\${${option}}" read -erp "Enter new value for ${option} [${value}]> " new - [ ! -z "${new}" ] && eval "${option}=\"${new}\"" + [ -n "${new}" ] && eval "${option}=\"${new}\"" ;; multi) eval "value=\${${option}}" diff --git a/target/lvp/x86/release_skeleton/scripts/plain b/target/lvp/x86/release_skeleton/scripts/plain index 75844c261..980d10939 100644 --- a/target/lvp/x86/release_skeleton/scripts/plain +++ b/target/lvp/x86/release_skeleton/scripts/plain @@ -56,8 +56,8 @@ process_plain(){ filesize=0 while read file ; do - [ ! -f "${file}" ] && continue - thisfilesize=`ls -l "${file}" | sed 's,[ \t][ \t]*, ,g' | cut -f5 -d' '` + [ -f "${file}" ] || continue + thisfilesize=`stat -c %s "${file}"` filesize=$(( ${filesize} + ${thisfilesize} )) done < ${moviefiles} @@ -82,11 +82,11 @@ process_plain(){ fi while read file ; do - [ ! -f "${file}" ] && continue + [ -f "${file}" ] || continue if [ -f "${target}/${file##*/}" ] ; then - origfilesize=`ls -l "${file}" | sed 's,[ \t][ \t]*, ,g' | cut -f5 -d' '` - targfilesize=`ls -l "${target}/${file##*/}" | sed 's,[ \t][ \t]*, ,g' | cut -f5 -d' '` + origfilesize=`stat -c %s "${file}"` + targfilesize=`stat -c %s "${target}/${file##*/}"` if [ ${origfilesize} -eq ${targfilesize} ] ; then echo "${target}/${file##*/} already exists."