Benjamin Schieder:

target/lvp/ChangeLog

@@ -1,4 +1,12 @@
 
+Fri Feb 25 19:50:36 CET 2005 Benjamin Schieder <blindcoder@scavenger.homeip.net>
+
+ * usual ROCK update
+ * update lvp program to 0.3.3 (scrolling of the menu)
+ * now uses linux kernel 2.6.10
+ * batch mode for release (automatically answer default to everything)
+ * textures in lvp program
+
 Tue Sep 28 09:54:01 CEST 2004 Benjamin Schieder <blindcoder@scavenger.homeip.net>
 
  * updated to use new ROCK Linux trunk (trunk 43xx)

target/lvp/build.sh

@@ -1,15 +1,14 @@
 
-lvp_ver="0.4.3"
+lvp_ver="0.4.4-dev"
 rootdir="${base}/build/${ROCKCFG_ID}"
 ROCKdir="${rootdir}/ROCK"
 releasedir="${ROCKdir}/lvp_${lvp_ver}_${ROCKCFG_X86_OPT}"
 syslinux_ver="`sed -n 's,.*syslinux-\(.*\).tar.*,\1,p' ${base}/target/${target}/download.txt`"
-kernelversion="`grep '\[V\]' ${base}/package/base/linux/linux.desc | head -n 2 | tail -n 1 | cut -f2 -d' '`"
+kernelversion="`grep '\[V\]' ${base}/package/base/linux/linux.desc | tail -n 1 | cut -f2 -d' '`"
 
 pkgloop
 
 . scripts/parse-config
-PATH="${rootdir}/${toolsdir}/diet-bin:${PATH}"
 
 echo_header "Creating LVP ..."
 
@@ -59,9 +58,15 @@ else
 		lib/modules/${kernelversion}-rock \
 		sbin/agetty \
 		sbin/hwscan \
+		sbin/rmmod \
+		sbin/modprobe \
+		sbin/insmod \
 		usr/bin/eject \
+		usr/bin/lsmod \
 		usr/sbin/lspci \
-		usr/share/kbd/keymaps ; do
+		usr/share/kbd/keymaps \
+		usr/share/pci.ids
+		do
 
 		mkdir -p ${x%/*}
 		cp -ar ${rootdir}/${x} ${x}
@@ -80,11 +85,6 @@ else
 	cd ..
 	mv bin/linuxrc .
 
-	cp ${rootdir}/sbin/insmod.static ${releasedir}/initrd/sbin/insmod
-	for x in kallsyms ksyms lsmod modprobe rmmod ; do
-		ln -sf /sbin/insmod ${releasedir}/initrd/sbin/${x}
-	done
-
 	echo_status "Creating the livesystem"
 	echo_status "Creating directory structure"
 	mkdir -p ${releasedir}/livesystem
@@ -128,8 +128,8 @@ else
 		usr/bin/tail \
 		usr/sbin/lspci \
 		sbin/losetup \
-		sbin/mdadm \
-		; do
+		sbin/mdadm
+		do
 
 		mkdir -p ${x%/*}
 		cp -ar ${rootdir}/${x} ${x}
@@ -151,9 +151,9 @@ else
 	cp ${base}/target/${target}/${arch}/livesystem/linuxrc ${releasedir}/livesystem/linuxrc ; chmod +x ${releasedir}/livesystem/linuxrc
 	echo_status "Copying startlvp script ..."
 	cp ${base}/target/${target}/${arch}/livesystem/startlvp ${releasedir}/livesystem/sbin/; chmod +x ${releasedir}/livesystem/sbin/startlvp
-	echo_status "Copying XF86Config ..."
+	echo_status "Creating xorg.conf symlink"
 	mkdir -p ${releasedir}/livesystem/etc/X11
-	cp ${base}/target/${target}/${arch}/livesystem/XF86Config ${releasedir}/livesystem/etc/X11/XF86Config
+	ln -sf /tmp/xorg.conf ${releasedir}/livesystem/etc/X11/xorg.conf
 	echo_status "Copying xinitrc ..."
 	mkdir -p ${releasedir}/livesystem/usr/X11R6/lib/X11/xinit
 	cp ${base}/target/${target}/${arch}/livesystem/xinitrc ${releasedir}/livesystem/usr/X11R6/lib/X11/xinit/xinitrc
@@ -176,6 +176,8 @@ else
 	mount -o loop ${releasedir}/isolinux/initrd ${releasedir}/initrd.tmp.${$}
 	mv ${releasedir}/initrd/* ${releasedir}/initrd.tmp.${$}
 	umount ${releasedir}/initrd.tmp.${$}
+
+	echo_status "Cleaning up ..."
 	rm -rf ${releasedir}/initrd.tmp.${$} ${releasedir}/initrd
 
 	echo_status "LVP v${lvp_ver} built for ${ROCKCFG_X86_OPT} is now ready in ${releasedir}."

target/lvp/config.in

@@ -26,7 +26,7 @@ pkgfilter sed '
 
 / 00-dirtree / { p; d; };
 / autoconf / { p; d; };
-/ automake=automake18 / { p; d; };
+/ automake=automake19 / { p; d; };
 / bash / { p; d; };
 / bin86 / { p; d; };
 / binutils / { p; d; };
@@ -41,6 +41,7 @@ pkgfilter sed '
 / findutils / { p; d; };
 / flex / { p; d; };
 / freeglut / { p; d; };
+/ freetype / { p; d; };
 / gawk / { p; d; };
 / gcc / { p; d; };
 / glibc / { p; d; };
@@ -64,7 +65,7 @@ pkgfilter sed '
 / make / { p; d; };
 / mdadm / { p; d; };
 / mktemp / { p; d; };
-/ modutils / { p; d; };
+/ module-init-tools / { p; d; };
 / mplayer / { p; d; };
 / nasm / { p; d; };
 / ncurses / { p; d; };
@@ -87,6 +88,8 @@ pkgfilter sed '
 # Disable all other packages
 /.*/	{ s/^X /O /p; d; };'
 
+# Disable perl5 in stage 7
+pkgfilter sed '/ perl5 / { s/^\([^7]*\)7\(.*\)perl5/\1-\2perl5/; }'
 ROCKCFGSET_CREATE_TARBZ2=1
 ROCKCFGSET_CREATE_GEM=0
 ROCKCFGSET_PKGFILE_VER=0
@@ -99,8 +102,8 @@ ROCKCFGSET_PKG_GCC34_NO_JAVA=1
 ROCKCFGSET_PKG_BASH_PROGCOMP=0
 ROCKCFGSET_PKG_BASH_INST_RLL=0
 ROCKCFGSET_PKG_BASH_DEFAULT='bash2'
-ROCKCFGSET_PKG_LINUX_SRC26=0
-ROCKCFGSET_PKG_LINUX_IMG26=0
+ROCKCFGSET_PKG_LINUX_SRC26=1
+ROCKCFGSET_PKG_LINUX_IMG26=1
 ROCKCFGSET_SPLIT_DOC=0
 ROCKCFGSET_SPLIT_DEV=0
 

target/lvp/kernel.conf → target/lvp/kernel24.conf

@@ -17,58 +17,6 @@ CONFIG_MODULES=y
 CONFIG_MODVERSIONS=y
 CONFIG_KMOD=y
 
-#
-# Processor type and features
-#
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-CONFIG_M586=y
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MELAN is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_USE_STRING_486=y
-CONFIG_X86_ALIGNMENT_16=y
-CONFIG_X86_PPRO_FENCE=y
-# CONFIG_X86_F00F_WORKS_OK is not set
-# CONFIG_X86_MCE is not set
-# CONFIG_TOSHIBA is not set
-# CONFIG_I8K is not set
-# CONFIG_MICROCODE is not set
-# CONFIG_X86_MSR is not set
-# CONFIG_X86_CPUID is not set
-# CONFIG_EDD is not set
-CONFIG_NOHIGHMEM=y
-# CONFIG_HIGHMEM4G is not set
-# CONFIG_HIGHMEM64G is not set
-# CONFIG_HIGHMEM is not set
-CONFIG_MATH_EMULATION=y
-CONFIG_MTRR=y
-# CONFIG_SMP is not set
-# CONFIG_X86_UP_APIC is not set
-# CONFIG_X86_UP_IOAPIC is not set
-# CONFIG_X86_TSC_DISABLE is not set
-
 #
 # General setup
 #

target/lvp/kernel26.conf

@@ -0,0 +1,811 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.10
+# Tue Feb 22 16:03:06 2005
+#
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+# 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_LOG_BUF_SHIFT=16
+CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
+# CONFIG_IKCONFIG is not set
+CONFIG_EMBEDDED=y
+# CONFIG_KALLSYMS is not set
+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_TINY_SHMEM=y
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODULE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+
+#
+# Processor type and features
+#
+CONFIG_X86_PC=y
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+# CONFIG_HPET_TIMER is not set
+# CONFIG_SMP 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
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_MTRR is not set
+# CONFIG_REGPARM is not set
+
+#
+# Power management options (ACPI, APM)
+#
+# CONFIG_PM is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+# CONFIG_ACPI is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_LEGACY_PROC=y
+CONFIG_PCI_NAMES=y
+# CONFIG_ISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PC-card bridges
+#
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_AES=y
+CONFIG_BLK_DEV_LOOP_KEYSCRUB=y
+# 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
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_IDEDISK is not set
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=y
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+# CONFIG_BLK_DEV_SD is not set
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+# CONFIG_CHR_DEV_SG is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_ISP 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_QLA6322 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID10 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_MD_RAID6 is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
+# CONFIG_BLK_DEV_DM is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_PACKET is not set
+# CONFIG_NETLINK_DEV 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
+#
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN 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
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_RAW is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+# CONFIG_VIDEO_SELECT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+# CONFIG_SND is not set
+
+#
+# Open Sound System
+#
+CONFIG_SOUND_PRIME=m
+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_ICH=m
+CONFIG_SOUND_SONICVIBES=m
+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_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_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_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_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_OPL3SA2=m
+CONFIG_SOUND_YMFPCI=m
+# CONFIG_SOUND_YMFPCI_LEGACY is not set
+CONFIG_SOUND_UART6850=m
+CONFIG_SOUND_AEDSP16=m
+# CONFIG_SC6600 is not set
+# CONFIG_AEDSP16_MSS is not set
+# 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
+
+#
+# USB support
+#
+# CONFIG_USB is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR 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
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+# CONFIG_SYSFS is not set
+CONFIG_DEVFS_FS=y
+CONFIG_DEVFS_MOUNT=y
+# CONFIG_DEVFS_DEBUG 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
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+# CONFIG_EXPORTFS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_DEBUG_KERNEL=y
+CONFIG_MAGIC_SYSRQ=y
+# 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_INFO 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
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC32 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_X86_BIOS_REBOOT=y

target/lvp/parse-config

@@ -22,7 +22,7 @@
 
 static=0
 
-for x in upx gzip sed kbd mplayer pciutils grep coreutils libgli lvp gawk findutils eject xfree86 flex ; do
+for x in upx gzip sed kbd mplayer pciutils grep coreutils libgli lvp gawk findutils eject xfree86 flex module-init-tools strace gdb ; do
 	[ "${pkg}" == "${x}" ] && static=1
 done
 
@@ -42,10 +42,10 @@ if [ "${pkg}" == "util-linux" ] ; then
 	hook_add postinstall 4 "unset LDFLAGS"
 fi
 
-if [ "${pkg}" == "modutils" ] ; then
-	echo_status "Building this package statically for LVP"
-	var_append confopt " " "--enable-combined"
-fi
+#if [ "${pkg}" == "module-init-tools" ] ; the
+#echo_status "Building this package statically for LVP"
+#var_append confopt " " "--enable-combined"
+#fi
 
 if [ "${pkg}" == "mdadm" ] ; then
 	echo_status "Building this package statically for LVP"

target/lvp/patches/xorg_hotfixes.patch

@@ -0,0 +1,122 @@
+# --- 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 - 2005 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
+@@ -66,8 +66,8 @@ extern "C" float	floorf(float);
+ #define NEEDCEILF
+ #endif
+ #elif defined(NEEDCEILF)
+-extern "C" float	ceilf(float);
+-extern "C" float	floorf(float);
++//extern "C" float	ceilf(float);
++//extern "C" float	floorf(float);
+ #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
+@@ -61,7 +61,7 @@
+ /* global variable for argv[0] */
+ const char *my_name = NULL;
+ 
+-#ifdef NEED_BASENAME
++#if 0
+ 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
+ 
+ INCLUDES=$(FREETYPE2INCLUDES) -I$(FONTCONFIGDIR)
+ 
+-LOCAL_LIBRARIES=FontconfigClientLibs
+-        DEPLIBS=FontconfigClientDepLibs
++LOCAL_LIBRARIES=FontconfigClientLibs -lz
++        DEPLIBS=FontconfigClientDepLibs -lz
+ 
+ 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
+@@ -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 \
+ 		  do_tris.o do_complex.o do_traps.o
+-LOCAL_LIBRARIES = $(XFTLIBS) $(XRENDERLIBS) $(XMUULIB) $(XLIB)
++LOCAL_LIBRARIES = $(XFTLIBS) $(XRENDERLIBS) $(XMUULIB) $(XLIB) -lz
+         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)
+ #endif
+         DEPLIBS = $(XRENDERDEPS) XkbClientDepLibs XawClientDepLibs
+-LOCAL_LIBRARIES = $(XRENDERLIBS) XkbClientLibs XawClientLibs
++LOCAL_LIBRARIES = $(XRENDERLIBS) XkbClientLibs XawClientLibs -lz
+            SRCS = xclock.c Clock.c
+            OBJS = xclock.o Clock.o
+         HEADERS = ClockP.h Clock.h
+--- xc/programs/xfd/Imakefile	2004-04-23 21:54:47.000000000 +0200
++++ xc/programs/xfd/Imakefile	2005-01-19 12:19:14.690934872 +0100
+@@ -15,7 +15,7 @@ XCOMM $XFree86: xc/programs/xfd/Imakefil
+     XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES) -I$(XBUILDINCDIR)
+ #endif
+         DEPLIBS = $(XRENDERDEPS) XawClientDepLibs XkbClientDepLibs
+-LOCAL_LIBRARIES = $(XRENDERLIBS) XawClientLibs XkbClientLibs
++LOCAL_LIBRARIES = $(XRENDERLIBS) XawClientLibs XkbClientLibs -lz
+            SRCS = xfd.c grid.c
+            OBJS = xfd.o grid.o
+        INCLUDES = $(XRENDERINCS)

target/lvp/pkg_freetype.conf

@@ -0,0 +1,3 @@
+[ -e ${confdir}/${pkg}.conf ] && . ${confdir}/${pkg}.conf
+
+var_append makeopt " " "LDFLAGS=-lz"

target/lvp/pkg_mplayer.conf

@@ -1,39 +1,15 @@
-mplayer_postmake() {
-	mkdir -p ${datadir}/${pkg}
-	echo "extracting the default font ..."
-	tar ${taropt} ${archdir}/font-arial-iso-8859-1.tar.bz2 -C ${datadir}/${pkg}
-	rm -rf ${datadir}/${pkg}/font
-	ln -sf font-arial-24-iso-8859-1 ${datadir}/${pkg}/font
+[ -e ${confdir}/${pkg}.conf ] && . ${confdir}/${pkg}.conf
 
-	echo "create a default configuration ..."
-	cat <<- EOT > ${sysconfdir}/mplayer.conf
-		framedrop=yes
-		menu=yes
-		font=/usr/share/mplayer/font/font.desc
-	EOT
-	cp -f etc/{input,menu,codecs}.conf ${sysconfdir}
-	echo "TAB menu up" >> ${sysconfdir}/input.conf
-	rm -f ${sysconfdir}/*.older
-	
-	echo "correcting permissions and ownership ..."
-	chown -R root.root ${datadir}/${pkg} ${docdir} ${sysconfdir}
-	find ${datadir}/${pkg} ${docdir} ${sysconfdir} -type d | xargs -r chmod 0755
-	find ${datadir}/${pkg} ${docdir} ${sysconfdir} -type f | xargs -r chmod 0644
-}
+var_append confopt " " "--enable-static --disable-shared-pp"
 
-var_append confopt " " "--enable-static"
-
-sysconfdir="${sysconfdir}/mplayer"
-var_append confopt " " "--prefix=${root}/${prefix} --confdir=${sysconfdir} --enable-menu"
-var_append confopt " " "--enable-linux-devfs --with-extraincdir=/usr/include/libpng"
-var_append confopt " " "--enable-fbdev --enable-largefiles"
+var_remove confopt " " "--enable-fbdev"
+var_remove confopt " " "--enable-shared-pp"
 
 if [ ${arch} = x86 ] ; then
 	var_append confopt " " "--with-win32libdir=${root}/${prefix}/lib/win32"
 fi
 
 var_append confopt " " "--enable-runtime-cpudetection"
-
-var_append confopt " " "--disable-i18n"
+var_append confopt " " "--disable-i18n --disable-termcap --disable-shm"
 
 postmake=mplayer_postmake

target/lvp/pkg_xorg.conf

@@ -0,0 +1,59 @@
+[ -e ${confdir}/${pkg}.conf ] && . ${confdir}/${pkg}.conf
+
+var_append patchfiles " " "${targetdir}/patches/xorg_hotfixes.patch"
+
+# configure the World for LVP
+xf_config() {
+	echo "Configuring XOrg for LVP ..."
+	if pkginstalled expat ; then
+		cat >> config/cf/host.def << EOT
+/* Disable the internal expat library to use the system installed one */
+#define		HasExpat		YES
+EOT
+	fi
+
+	cat >> config/cf/host.def << EOT
+/* Disable the internal zlib to use the system installed one */
+#define		HasZlib			YES
+
+/* Less warnings with recent gccs ... */
+#define		DefaultCCOptions	-ansi GccWarningOptions
+
+/* Make sure config files are allways installed ... */
+#define		InstallXinitConfig	YES
+#define		InstallXdmConfig	YES
+#define		InstallFSConfig		YES
+
+/* do not install duplicate crap in /etc/X11 */
+#define		UseSeparateConfDir	NO
+
+/* build statically */
+#define DoLoadableServer	NO
+#define ForceNormalLib		YES
+EOT
+#/* build only the server */ // okay, this would work
+#// #define BuildServersOnly	YES 
+
+	
+	if [ ${arch} == "x86" ] ; then
+	        echo "Enabling Matrox HALlib (since this is x86) ..."
+		cat >> config/cf/host.def << EOT
+
+/* Additinal TV/DVI support since this is x86 */
+#define		HaveMatroxHal		YES
+EOT
+	fi
+}
+
+# build the World
+xf_build() {
+	find . -name Imakefile | while read file ; do
+		sed -i 's,LOCAL_LIBRARIES = \([^\\]*\),LOCAL_LIBRARIES = \1 -lz ,g' $file
+	done
+	eval "$MAKE World \"FREETYPE2LIB=-lfreetype -lz\" \"CRYPT_LIBRARIES=-lcrypt\""
+#cd nls ; eval "$MAKE \"FREETYPE2LIB=-lfreetype -lz\" \"CRYPT_LIBRARIES=-lcrypt\"" ; cd ..
+	echo "install.man: " >nls/Makefile
+	echo "	echo nothing to see here, please move on" >>nls/Makefile # don't want to fiddle with xf_install, too
+	echo "install: " >>nls/Makefile
+	echo "	echo nothing to see here, please move on" >>nls/Makefile # don't want to fiddle with xf_install, too
+}

target/lvp/x86/help0.txt

@@ -5,7 +5,7 @@
 |                               / /__| |/ / ____/                           |
 |                              /_____/___/_/                                |
 |   [===================================================================]   |
-|                           V 0.4.3 "Berlin-Spandau"                        |
+|                           V 0.4.4 "graphics galore"                       |
 |                                                                           |
 | Kernel Images:                                                            |
 |       lvp             Start LVP                                           |

target/lvp/x86/initrd/hardware

@@ -2,7 +2,8 @@
 
 echo "Trying to autodetect hardware..."
 
-/bin/hwscan >/tmp/hardware
+read a b version c < /proc/version
+/bin/hwscan -k ${version} >/tmp/hardware
 
 if [ `grep -c '^# ' /tmp/hardware` -gt 0 ] ; then
 	echo 'Found the following:'
@@ -18,7 +19,7 @@ fi
 if [ ! -s /tmp/hardware ] ; then
 	echo "EEP! hwscan screwed up!"
 	echo -n "Trying emergency module loading ... "
-	for x in `find /lib/modules/ -name '*.o'` ; do
+	for x in `find /lib/modules/ -name '*.ko'` ; do
 		insmod ${x} >/dev/null 2>&1
 	done
 	echo "done"
@@ -33,4 +34,8 @@ if [ ! -e /dev/sound/dsp ] ; then
 	read
 fi
 
+if [ ! -e /dev/sound/dsp ] ; then
+	echo "Still no sound. Continuing anyway"
+fi
+
 exit 0

target/lvp/x86/initrd/kernel

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-for x in /lib/modules/*/block/loop_*.o ; do
+for x in /lib/modules/*/block/loop_* ; do
 	insmod ${x} >/dev/null 2>&1 
 done

target/lvp/x86/livesystem/etc_lvp_10-encryption.sh

@@ -29,7 +29,8 @@ encryption_start() {
 
 		exec 2>/dev/null
 		while [ ! -e /mnt1/lvp.xml ] ; do
-			read -p "Please enter passphrase: " -s passphrase
+			echo -n "Please enter passphrase: "
+			read -s passphrase
 			echo
 			for x in /lvp.data* ; do
 				echo "${passphrase}" | losetup -e ${thisenc} -p 0 /dev/loop/${x#/lvp.data} ${x} 
@@ -49,13 +50,11 @@ encryption_start() {
 }
 
 encryption_stop(){
-	exec 2>/dev/null
 	umount /mnt1
-	mdadm /dev/md/0 -S
+	mdadm -S /dev/md/0
 	for x in /lvp.data* ; do
 		losetup -d /dev/loop/${x#/lvp.data}
 	done
-	exec 2>&1
 }
 
 encryption_(){

target/lvp/x86/livesystem/linuxrc

@@ -3,6 +3,7 @@
 mount -t proc none /proc
 mount -t tmpfs none /tmp
 mount -t devfs none /dev
+mount -t devpts none /dev/pts
 
 cd /dev ; rm -f fd
 ln -sf /proc/kcore      core
@@ -18,7 +19,7 @@ export PATH="/sbin:/bin:/usr/sbin:/usr/bin"
 
 for x in /etc/lvp/*.sh ; do
    if [ -f "${x}" ] ; then
-      echo ; echo "Starting ${x##*/} ..." ; sh ${x} start
+      echo ; echo "Starting ${x##*/} ..." ; bash ${x} start
       echo "Setup script ${x##*/} finished."
    fi
 done
@@ -27,11 +28,12 @@ done
 
 for x in /etc/lvp/*.sh ; do
    if [ -f "${x}" ] ; then
-      echo ; echo "Stopping ${x##*/} ..." ; sh ${x} stop
+      echo ; echo "Stopping ${x##*/} ..." ; bash ${x} stop
       echo "Setup script ${x##*/} finished."
    fi
 done
 
+umount /dev/pts
+umount /dev
 umount /proc
 umount /tmp
-umount /dev

target/lvp/x86/livesystem/startlvp

@@ -3,5 +3,5 @@
 exec < /dev/console > /dev/console 2> /dev/console ; cd /
 
 export HOME="/tmp"
-/usr/X11/bin/startx -- -xf86config /tmp/XF86Config -logfile /tmp/X >/dev/null 2>&1
+/usr/X11/bin/startx -- -logfile /tmp/X >/dev/null 2>&1
 

target/lvp/x86/release_skeleton/config.sh

@@ -29,7 +29,7 @@ while [ "${quit}" == "0" ] ; do
 			scripts/cleanup
 			;;
 		i)
-			scripts/create-iso
+			scripts/create_iso
 			;;
 		*)
 			get ${choice}

target/lvp/x86/release_skeleton/scripts/cleanup

@@ -11,7 +11,7 @@ for x in livesystem/* ; do
 	done
 	[ ${found} -eq 1 ] && continue
 	echo -n "removing ${x#livesystem/} ... "
-	rm -rf livesystem/${x#livesystem/}
+	rm -rf "livesystem/${x#livesystem/}"
 	echo "done"
 done
 

target/lvp/x86/release_skeleton/scripts/configuration

@@ -1,10 +1,10 @@
 multi LVP_TYPE plain "How to store data on the LVP" plain encrypted
 if [ "${LVP_TYPE}" == "encrypted" ] ; then
 	multi LVP_ENTROPY_SOURCE random "What device to use for creating the pseudo-filesystems" random urandom zero
-	multi LVP_ENCRYPTION blowfish "What encryption-algorythm to use" blowfish twofish serpent
+	multi LVP_ENCRYPTION blowfish "What encryption-algorhythm to use" blowfish twofish serpent
 fi
 
-multi LVP_SIZE dvd "What medium you are using" cd dvd other
+multi LVP_SIZE dvd "What medium are you using" cd dvd other
 if [ "${LVP_SIZE}" == "other" ] ; then
 	text LVP_SIZE_OTHER 700 "Size your medium can hold in MB"
 fi
@@ -13,6 +13,8 @@ text LVP_MPLAYER_OPTS "" "Parameters to add to mplayer"
 
 text LVP_FILES "" "Files to put on this medium"
 
+bool LVP_USE_DEFAULTS 1 "Batch mode (assume default answer to everything)"
+
 comment ""
 comment "s - Save Configuration"
 comment "l - Load Configuration"

target/lvp/x86/release_skeleton/scripts/create_lvpxml

@@ -4,15 +4,37 @@ usage_create_lvpxml() {
 	echo -n
 }
 
+create_thumbnail() {
+	tmp="`mktemp`"
+	rm -f $tmp
+	file="$1"
+	item=$2
+	time=$3
+
+	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
+	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
+	mv $tmp $item.color.rgb
+	mv $tmp.gray $item.gray.rgb
+	rm -f $tmp*
+	rm -f 000*
+	return 0
+}
+
 process_create_lvpxml() {
 	unset files
 	unset title
 	unset titleold
+	time="00:02:00"
 	offset=0
 
-	for x in `printenv | grep ^file_ | cut -f1 -d=` ; do
-		[ ! -z "${files}" ] && files="${files}\n"
-		files="${files}${x}"
+	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
 	done
 
 	files=`echo -e ${files} | sort`
@@ -35,42 +57,77 @@ process_create_lvpxml() {
 			if [ ${?} -eq 0 ] ; then
 				[ ${offset} -gt 0 ] && offset=$(( ${offset} + 2 ))
 				[ $(( ${item} % 4 )) -gt 0 ] && item=$(( ${item} + ( 4 - ( ${item} % 4 ) ) ))
-				read -p "Please enter new title [${title}]: " tmp
-				[ ! -z "${tmp}" ] && title="${tmp}"
+				lvp_read tmp "${title}" Please enter new title [${title}]:
+				[ -z "${tmp}" ] || title="${tmp}"
 				cat >> ${lvpxml} <<-EOF
-				<item type="text">
-					<position x="0" y="$(( 95 - ((${item} - (${item} % 4)) / 4) * 15 - ${offset} ))">
-					<size w="5" h="5">
-					<text>${title}</text>
-				</item>
+					<item type="text">
+						<position x="0" y="$(( 95 - ((${item} - (${item} % 4)) / 4) * 50 - ${offset} ))">
+						<size w="5" h="5">
+						<text>${title}</text>
+					</item>
 				EOF
 				offset=$(( ${offset} + 10 ))
 			fi
 		fi
 
+		echo "File is ${file##*/}"
+		lvp_read tmp "${time}" Time to get thumbnail from [${time}]:
+		[ -n "${tmp}" ] && time="${tmp}"
+		echo -n "Creating thumbnail ... "
+		if create_thumbnail "$file" $item "$time" ; then
+			mv $item.color.rgb livesystem/${file%/*}/
+			mv $item.gray.rgb livesystem/${file%/*}/
+			echo "done"
+		else
+			echo "failed"
+			echo "Using traditional display."
+		fi
+		
 		button_text=${file%.*}
 		button_text=${button_text##*- }
-		read -p "Enter button text for ${file} [${button_text}]: " tmp
-		[ ! -z "${tmp}" ] && button_text=${tmp}
-		cat >> ${lvpxml} << EOF
-	<item type="button">
-		<position x="$(( (${item} % 4) * 50 - 75 ))" y="$(( 95 - ((${item} - (${item} % 4)) / 4) * 15 - ${offset} ))" />
-		<action>/usr/bin/mplayer -fs -zoom ${mplayer_param} '${file}'</action>
-		<size w="40" h="10" />
-		<text>${button_text}</text>
-	</item>
-EOF
-# a little "special" for multi-language anime
-#if [ "${file##*.}" == "avi" ] ; then
-#cat >> ${lvpxml} << EOF
-#<item type="button">
-#<position x="$(( (${item} % 4) * 50 - 75 ))" y="$(( 95 - ((${item} - (${item} % 4)) / 4) * 15 - 7 - ${offset} ))" />
-#<action>/usr/bin/mplayer -aid 2 -sid 3 -fs -zoom '${file}'</action>
-#<size w="40" h="4" />
-#<text>jap</text>
-#</item>
-#EOF
-#fi
+		lvp_read tmp "${button_text}" Enter button text for ${file} [${button_text}]:
+		[ -z "${tmp}" ] || button_text=${tmp}
+		if [ -e livesystem/${file%/*}/$item.color.rgb ] ; then
+			cat >> ${lvpxml} <<-EOF
+				<item type="buttontexture">
+					<texture normal=".${file%/*}/$item.gray.rgb" over=".${file%/*}/$item.color.rgb" pressed=".${file%/*}/$item.color.rgb" />
+					<position x="$(( (${item} % 4) * 50 - 75 ))" y="$(( 75 - ((${item} - (${item} % 4)) / 4) * 50 - ${offset} ))" />
+					<action>/usr/bin/mplayer -fs -zoom -alang en ${mplayer_param} '${file}'</action>
+					<size w="40" h="40" />
+				</item>
+				<item type="text">
+					<position x="$(( (${item} % 4) * 50 - 75 ))" y="$(( 75 - ((${item} - (${item} % 4)) / 4) * 50 - ${offset} - 25))"
+					<size w="5" h="5">
+					<text>${button_text}</text>
+				</item>
+			EOF
+		else
+			cat >> ${lvpxml} <<-EOF
+				<item type="button">
+					<position x="$(( (${item} % 4) * 50 - 75 ))" y="$(( 75 - ((${item} - (${item} % 4)) / 4) * 50 - ${offset} ))" />
+					<action>/usr/bin/mplayer -fs -zoom ${mplayer_param} '${file}'</action>
+					<size w="40" h="40" />
+					<text>${button_text}</text>
+				</item>
+			EOF
+		fi
+#a little "special" for multi-language anime
+		if [ "${file##*.}" == "mkv" -o "${file##*.}" == "ogm" ] ; then
+			echo "This looks like a multi-languaged file."
+			confirm "Do you want to add a small button with a second language?"
+			if [ ${?} -eq 0 ] ; then
+				lvp_read alang "ja" Audio language [ja]:
+				lvp_read slang "en" Sub language [en]:
+				cat >> ${lvpxml} <<-EOF
+					<item type="button">
+					<position x="$(( (${item} % 4) * 50 - 75 ))" y="$(( 75 - ((${item} - (${item} % 4)) / 4) * 50 - 22 - ${offset} ))" />
+					<action>/usr/bin/mplayer -alang ${alang} -slang ${slang} -fs -zoom ${mplayer_param} '${file}'</action>
+					<size w="40" h="4" />
+					<text>jap</text>
+					</item>
+				EOF
+			fi
+		fi
 		item=$(( ${item} + 1 ))
 	done
 	echo "</lvp>" >> ${lvpxml}

target/lvp/x86/release_skeleton/scripts/encrypted

@@ -8,7 +8,7 @@ process_encrypted(){
 
 	for module in twofish blowfish serpent ; do
 		eval "encryption_${module}=0"
-		modprobe loop_${module} >/dev/null 2>&1 # fails for kernel >= 2.5.48 if module already loaded
+		[ `lsmod | grep -c "loop_${module}"` -eq 0 ] && modprobe loop_${module} >/dev/null 2>&1 # fails for kernel >= 2.5.48 if module already loaded
 		[ `lsmod | grep -c "loop_${module}"` -eq 1 ] && eval "encryption_${module}=1"
 	done
 
@@ -30,7 +30,7 @@ process_encrypted(){
 	fi
 
 	echo "Loading kernel module for linear mode"
-	modprobe linear 2>&1 >/dev/null || true
+	grep -q linear /proc/mdstat || modprobe linear
 	if ! grep -q linear /proc/mdstat ; then
 		echo "Sorry, you don't have linear RAID support in your kernel."
 		echo "Since V0.4.2 this is required for encrypted LVPs to use"
@@ -94,9 +94,9 @@ process_encrypted(){
 
 	echo "Okay, Now creating files that will hold the pseudo filesystems"
 	unset ddparam
-	[ `dd --help | grep -c stat` -eq 1 ] && ddparam="conv=stat"
 	unset cpparam
-	cp -D ${moviefiles} /dev/null 2>&1 >/dev/null && cpparam="-D"
+	[ `dd --help | grep -c stat` -eq 1 ] && ddparam="conv=stat"
+	[ `cp --help | grep -c "print copyprogress"` -eq 1 ] && cpparam="-D"
 
 	if [ -e ${target}/lvp.data1 ] ; then
 		for x in ${target}/lvp.data* ; do
@@ -114,10 +114,10 @@ process_encrypted(){
 		file="${target}/lvp.data${filesystem}"
 
 		if [ ${filesystem} -lt ${needed_pseudofs} ] ; then
-			size=2147481600
+			size=2147481600 # iso9660 limitation
 		else
 			size=$(( ${filesize} - ( ${filesystem} - 1 ) * 2147481600 ))
-			size=$(( ( ${size} / 2048 ) * 2048 ))
+			size=$(( ( ${size} / 2048 ) * 2048 )) # so we have a round number
 		fi
 
 		if [ -f ${file} ] ; then
@@ -130,8 +130,7 @@ process_encrypted(){
 			fi
 		fi
 		[ -f ${target}/lvp.data${filesystem} ] && continue
-		dd if=/dev/${entrosource} of=${target}/lvp.data${filesystem} \
-			bs=2k count=$(( ${size} / 2048 )) ${ddparam}
+		dd if=/dev/${entrosource} of=${target}/lvp.data${filesystem} bs=2k count=$(( ${size} / 2048 )) ${ddparam}
 	done
 
 	echo "Creating mountpoint"
@@ -222,7 +221,7 @@ process_encrypted(){
 	echo "Umounting filesystem ${mddev}"
 	umount ${mddev}
 	echo "Shutting down ${mddev}"
-	mdadm ${mddev} -S
+	mdadm -S ${mddev}
 
 	lvpdata=${needed_pseudofs}
 	while [ ${lvpdata} -ge 1 ] ; do

target/lvp/x86/release_skeleton/scripts/functions

@@ -26,9 +26,28 @@ human_readable() {
 	echo "${size}"
 }
 # }}}
+# {{{ lvp_read
+function lvp_read {
+	var=$1
+	shift
+	default=${1}
+	shift
+	if [ ${LVP_USE_DEFAULTS} -eq 1 ] ; then
+		echo "${@} ${default} (batch mode)"
+		eval "${var}=\"${default}\""
+		return
+	fi
+	eval "read -p \"${@}\" ${var}"
+	return
+}
+# }}}
 # {{{ confirm
 function confirm {
 	unset yesno
+	if [ ${LVP_USE_DEFAULTS} -eq 1 ] ; then
+		echo "${@} [yes|no] ? yes (batch mode)"
+		yesno="yes"
+	fi
 	while [ "${yesno}" != "yes" -a "${yesno}" != "no" ] ; do
 		echo -n "${@} [yes|no] ? "
 		read yesno
@@ -207,7 +226,7 @@ get () {
 			;;
 		bool)
 			eval "value=\${${option}}"
-			if [ "${value}" == "1" ] ; then
+			if [ ${value} -eq 1 ] ; then
 				eval "${option}=0"
 			else
 				eval "${option}=1"

target/lvp/x86/release_skeleton/scripts/plain

@@ -44,6 +44,7 @@ process_plain(){
 
 	echo -n "Checking Livesystem size ... "
 	livesize=`du -sb ${target} | cut -f1`
+	livesize=$(( ${livesize} + `du -sb isolinux | cut -f1` ))
 	echo "`human_readable ${livesize}`"
 	filesize=$(( ${filesize} + ${livesize} ))
 	echo
@@ -81,6 +82,6 @@ process_plain(){
 		eval "export file_${environment##*/}=\"/${file##*/}\""
 	done < ${moviefiles}
 
-	lvpxml=livesystem/lvp.xml
+	lvpxml=${target}/lvp.xml
 	process_create_lvpxml
 }