From 22b9e4059558d56fd084e768e21713218db94365 Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 26 Nov 2006 21:34:31 +0000 Subject: [PATCH] Installer lauft durch und IDE Systeme booten :D git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@350 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/kernel/kernel.config.i586 | 8 +- config/kernel/kernel.config.i586.smp | 160 ++++++++++++++++++--------- config/rootfiles/common/bootsplash | 11 ++ config/rootfiles/common/lcms | 20 ++++ doc/packages-list.txt | 1 - lfs/strip | 2 +- src/install+setup/install/main.c | 36 +++++- 7 files changed, 177 insertions(+), 61 deletions(-) create mode 100644 config/rootfiles/common/bootsplash create mode 100644 config/rootfiles/common/lcms diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index 664bb02230..c357a8a33d 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16 -# Tue Nov 14 22:30:30 2006 +# Wed Nov 15 11:02:15 2006 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -605,14 +605,14 @@ CONFIG_BLK_DEV_IDEFLOPPY=y # # IDE chipset support/bugfixes # -CONFIG_IDE_GENERIC=m +CONFIG_IDE_GENERIC=y CONFIG_BLK_DEV_CMD640=y # CONFIG_BLK_DEV_CMD640_ENHANCED is not set CONFIG_BLK_DEV_IDEPNP=y CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y # CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m +CONFIG_BLK_DEV_GENERIC=y CONFIG_BLK_DEV_OPTI621=m CONFIG_BLK_DEV_RZ1000=m CONFIG_BLK_DEV_IDEDMA_PCI=y @@ -666,7 +666,7 @@ CONFIG_IDEDMA_AUTO=y # # SCSI device support # -CONFIG_RAID_ATTRS=m +CONFIG_RAID_ATTRS=y CONFIG_SCSI=m # CONFIG_SCSI_PROC_FS is not set diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index 7a5878e706..a33a9f565b 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16 -# Tue Nov 14 22:39:06 2006 +# Wed Nov 15 11:45:07 2006 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -39,6 +39,7 @@ CONFIG_VM86=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y @@ -140,11 +141,11 @@ CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_SMP=y CONFIG_NR_CPUS=8 -# CONFIG_SCHED_SMT is not set +CONFIG_SCHED_SMT=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set -# CONFIG_PREEMPT_BKL is not set +CONFIG_PREEMPT_BKL=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_MCE=y @@ -262,6 +263,7 @@ CONFIG_PCI_MMCONFIG=y CONFIG_PCIEPORTBUS=y # CONFIG_PCI_MSI is not set # CONFIG_PCI_LEGACY_PROC is not set +# CONFIG_PCI_DEBUG is not set CONFIG_ISA_DMA_API=y CONFIG_ISA=y CONFIG_EISA=y @@ -395,9 +397,9 @@ CONFIG_IP_NF_CONNTRACK_NETLINK=m CONFIG_IP_NF_CT_PROTO_SCTP=m CONFIG_IP_NF_FTP=m CONFIG_IP_NF_IRC=m -CONFIG_IP_NF_NETBIOS_NS=m -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m +# CONFIG_IP_NF_NETBIOS_NS is not set +# CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_NF_AMANDA is not set CONFIG_IP_NF_PPTP=m CONFIG_IP_NF_QUEUE=m @@ -515,38 +517,12 @@ CONFIG_NET_ESTIMATOR=y # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_CMTP=m -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUSB=m -CONFIG_BT_HCIUSB_SCO=y -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m +# CONFIG_BT is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m -CONFIG_IEEE80211_CRYPT_CCMP=m -CONFIG_IEEE80211_CRYPT_TKIP=m +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set # # Device Drivers @@ -558,6 +534,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set # # Connector - unified userspace <-> kernelspace linker @@ -634,14 +611,14 @@ CONFIG_BLK_DEV_IDEFLOPPY=y # # IDE chipset support/bugfixes # -CONFIG_IDE_GENERIC=m +CONFIG_IDE_GENERIC=y CONFIG_BLK_DEV_CMD640=y # CONFIG_BLK_DEV_CMD640_ENHANCED is not set CONFIG_BLK_DEV_IDEPNP=y CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y # CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m +CONFIG_BLK_DEV_GENERIC=y CONFIG_BLK_DEV_OPTI621=m CONFIG_BLK_DEV_RZ1000=m CONFIG_BLK_DEV_IDEDMA_PCI=y @@ -695,7 +672,7 @@ CONFIG_IDEDMA_AUTO=y # # SCSI device support # -CONFIG_RAID_ATTRS=m +CONFIG_RAID_ATTRS=y CONFIG_SCSI=m # CONFIG_SCSI_PROC_FS is not set @@ -1242,9 +1219,7 @@ CONFIG_ATM_FORE200E_DEBUG=0 CONFIG_ATM_FORE200E=m CONFIG_ATM_HE=m CONFIG_ATM_HE_USE_SUNI=y -CONFIG_FDDI=y -CONFIG_DEFXX=m -CONFIG_SKFP=m +# CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PPP=m CONFIG_PPP_MULTILINK=y @@ -1513,8 +1488,40 @@ CONFIG_SENSORS_HDAPS=m # # Graphics support # -# CONFIG_FB is not set +CONFIG_FB=m +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_VGA16 is not set CONFIG_VIDEO_SELECT=y +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I810 is not set +# CONFIG_FB_INTEL is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON_OLD is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_CYBLA is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_VIRTUAL is not set # # Console display driver support @@ -1522,6 +1529,21 @@ CONFIG_VIDEO_SELECT=y CONFIG_VGA_CONSOLE=y # CONFIG_MDA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=m +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +# CONFIG_LOGO is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Bootsplash configuration +# # # Sound @@ -1697,10 +1719,7 @@ CONFIG_USB_XUSBATM=m # # MMC/SD Card support # -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -CONFIG_MMC_BLOCK=m -CONFIG_MMC_WBSD=m +# CONFIG_MMC is not set # # InfiniBand support @@ -1720,14 +1739,19 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m +CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set @@ -1792,8 +1816,19 @@ CONFIG_RAMFS=y # # Network File Systems # -# CONFIG_NFS_FS is not set -# CONFIG_NFSD is not set +CONFIG_NFS_FS=m +# CONFIG_NFS_V3 is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +# CONFIG_NFSD_V3 is not set +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set @@ -1862,10 +1897,29 @@ CONFIG_NLS_DEFAULT="cp437" # # CONFIG_PRINTK_TIME is not set # CONFIG_MAGIC_SYSRQ is not set -# CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=15 +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_FRAME_POINTER is not set +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set CONFIG_EARLY_PRINTK=y +CONFIG_DEBUG_STACKOVERFLOW=y +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_DEBUG_RODATA is not set +CONFIG_4KSTACKS=y CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y diff --git a/config/rootfiles/common/bootsplash b/config/rootfiles/common/bootsplash new file mode 100644 index 0000000000..a1a00cba8e --- /dev/null +++ b/config/rootfiles/common/bootsplash @@ -0,0 +1,11 @@ +#boot/splash +#boot/splash/config +boot/splash/config/bootsplash-1024x768.cfg +#boot/splash/images +boot/splash/images/bootsplash-1024x768.jpg +boot/splash/images/silent-1024x768.jpg +sbin/bootanim +sbin/fbmngplay +sbin/fbresolution +sbin/fbtruetype +sbin/splash diff --git a/config/rootfiles/common/lcms b/config/rootfiles/common/lcms new file mode 100644 index 0000000000..ca7f41f3ea --- /dev/null +++ b/config/rootfiles/common/lcms @@ -0,0 +1,20 @@ +#usr/bin/icc2ps +#usr/bin/icclink +#usr/bin/icctrans +#usr/bin/jpegicc +#usr/bin/tiffdiff +#usr/bin/tifficc +#usr/bin/wtpt +#usr/include/icc34.h +#usr/include/lcms.h +#usr/lib/liblcms.a +#usr/lib/liblcms.la +usr/lib/liblcms.so +usr/lib/liblcms.so.1 +usr/lib/liblcms.so.1.0.15 +#usr/lib/pkgconfig/lcms.pc +#usr/man/man1/icc2ps.1 +#usr/man/man1/icclink.1 +#usr/man/man1/jpegicc.1 +#usr/man/man1/tifficc.1 +#usr/man/man1/wtpt.1 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index d73656b80f..588838976b 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -106,7 +106,6 @@ * java-1.5.0_06-for-ipfire * jpegsrc.v6b * kbd-1.12 -* kudzu-1.1.95.15 * kudzu-1.2.60 * l7-protocols-2006-09-10 * lame-3.96.1 diff --git a/lfs/strip b/lfs/strip index a3e437e327..92e6522399 100644 --- a/lfs/strip +++ b/lfs/strip @@ -63,7 +63,7 @@ ifeq "$(LFS_PASS)" "install" # Don't use --strip-all on libraries, or they'll be destroyed. Don't use --strip-unneeded, either. -/tools/bin/find /lib /usr/lib /usr/share/rrdtool-* /install/initrd/lib \ -type f \( -name '*.so' -o -name '*.so[\.0-9]*' \) \ - -exec $(TOOLS_DIR)/bin/strip --strip-debug {} \; #2>/dev/null + -exec /tools/bin/strip --strip-debug {} \; #2>/dev/null -/tools/bin/strip --strip-all /{,usr/}{,local/}{bin,sbin}/* /install/{initrd,misc}/bin/* -/tools/bin/strip --strip-all /usr/lib/awk/{grcat,pwcat} diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 62fed73678..e87ebb7e23 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -737,6 +737,28 @@ int main(int argc, char *argv[]) goto EXIT; } + /* if we detected SCSI then fixup */ + if ((handle = fopen("/scsidriver", "r"))) + { + char *driver; + fgets(line, STRING_SIZE-1, handle); + fclose(handle); + line[strlen(line) - 1] = 0; + driver = strtok(line, "."); + fprintf(flog, "Detected SCSI driver %s\n",driver); + if (strlen(driver) > 1) { + fprintf(flog, "Fixing up ipfirerd.img\n"); + mysystem("/bin/chroot /harddisk /sbin/modprobe loop"); + mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO); + snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata --with=ataraid /boot/ipfirerd.img %s", driver, KERNEL_VERSION); + runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]); + snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata --with=ataraid /boot/ipfirerd-smp.img %s-smp", driver, KERNEL_VERSION); + runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]); + mysystem("/bin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf"); + } + } + + /* Build cache lang file */ snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\""); if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE])) @@ -768,8 +790,18 @@ int main(int argc, char *argv[]) goto EXIT; } - mysystem("umount /harddisk/proc/"); - mysystem("umount /harddisk/dev/"); + /* Install bootsplash */ + mysystem("/bin/installbootsplash.sh"); + + mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst"); + mysystem("umount /harddisk/proc"); + mysystem("umount /harddisk/dev"); + + sprintf(message, ctr[TR_CONGRATULATIONS_LONG], + NAME, SNAME, SNAME, NAME, NAME, NAME); + newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message); + + allok = 1; EXIT: fprintf(flog, "Install program ended.\n"); -- 2.39.2