Author: jhuntwork Date: 2005-08-02 14:48:08 -0600 (Tue, 02 Aug 2005) New Revision: 508
Modified: x86/trunk/linux/config x86/trunk/packages/linux/Makefile Log: Updated linux Makefile Modified: x86/trunk/linux/config =================================================================== --- x86/trunk/linux/config 2005-08-02 20:17:28 UTC (rev 507) +++ x86/trunk/linux/config 2005-08-02 20:48:08 UTC (rev 508) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11.12 -# Fri Jun 24 16:10:52 2005 +# Linux kernel version: 2.6.12.3 +# Tue Aug 2 22:45:50 2005 # CONFIG_X86=y CONFIG_MMU=y @@ -17,6 +17,7 @@ CONFIG_BROKEN=y CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup @@ -29,23 +30,26 @@ CONFIG_SYSCTL=y CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y -CONFIG_LOG_BUF_SHIFT=15 CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +# CONFIG_CPUSETS is not set # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SHMEM=y CONFIG_CC_ALIGN_FUNCTIONS=0 CONFIG_CC_ALIGN_LABELS=0 CONFIG_CC_ALIGN_LOOPS=0 CONFIG_CC_ALIGN_JUMPS=0 # CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 # # Loadable module support @@ -89,6 +93,7 @@ # CONFIG_MWINCHIPC6 is not set # CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set CONFIG_X86_GENERIC=y @@ -118,6 +123,7 @@ CONFIG_X86_MCE_P4THERMAL=y CONFIG_TOSHIBA=m CONFIG_I8K=m +CONFIG_X86_REBOOTFIXUPS=y # CONFIG_MICROCODE is not set # CONFIG_X86_MSR is not set # CONFIG_X86_CPUID is not set @@ -137,6 +143,7 @@ CONFIG_IRQBALANCE=y CONFIG_HAVE_DEC_LOCK=y # CONFIG_REGPARM is not set +CONFIG_SECCOMP=y # # Power management options (ACPI, APM) @@ -205,6 +212,7 @@ # CONFIG_PCI_MSI is not set CONFIG_PCI_LEGACY_PROC=y CONFIG_PCI_NAMES=y +CONFIG_ISA_DMA_API=y CONFIG_ISA=y # CONFIG_EISA is not set # CONFIG_MCA is not set @@ -262,12 +270,11 @@ # CONFIG_PARPORT=y CONFIG_PARPORT_PC=y -CONFIG_PARPORT_PC_CML1=y # CONFIG_PARPORT_SERIAL is not set # CONFIG_PARPORT_PC_FIFO is not set # CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m -# CONFIG_PARPORT_OTHER is not set +# CONFIG_PARPORT_GSC is not set # CONFIG_PARPORT_1284 is not set # @@ -506,6 +513,7 @@ CONFIG_SCSI_QLA2300=y CONFIG_SCSI_QLA2322=y CONFIG_SCSI_QLA6312=y +CONFIG_SCSI_LPFC=m CONFIG_SCSI_SEAGATE=y CONFIG_SCSI_SYM53C416=y CONFIG_SCSI_DC395x=y @@ -551,6 +559,8 @@ CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m CONFIG_DM_ZERO=m +CONFIG_DM_MULTIPATH=m +# CONFIG_DM_MULTIPATH_EMC is not set # # Fusion MPT device support @@ -601,7 +611,6 @@ # CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set -# CONFIG_NETLINK_DEV is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y @@ -801,7 +810,6 @@ CONFIG_DGRS=m CONFIG_EEPRO100=m CONFIG_E100=m -# CONFIG_E100_NAPI is not set CONFIG_FEALNX=m CONFIG_NATSEMI=m CONFIG_NE2K_PCI=m @@ -836,6 +844,7 @@ CONFIG_SK98LIN=m CONFIG_VIA_VELOCITY=m CONFIG_TIGON3=m +CONFIG_BNX2=m # # Ethernet (10000 Mbit) @@ -956,20 +965,6 @@ # 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=m -# CONFIG_SERIO_CT82C710 is not set -# CONFIG_SERIO_PARKBD is not set -# CONFIG_SERIO_PCIPS2 is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set - -# # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y @@ -990,6 +985,19 @@ # CONFIG_INPUT_MISC is not set # +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# # Character devices # CONFIG_VT=y @@ -1011,6 +1019,7 @@ # Non-8250 serial port support # CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_JSM=m CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set CONFIG_PRINTER=m @@ -1045,7 +1054,6 @@ CONFIG_AGP_AMD=m CONFIG_AGP_AMD64=m CONFIG_AGP_INTEL=m -CONFIG_AGP_INTEL_MCH=m CONFIG_AGP_NVIDIA=m CONFIG_AGP_SIS=m CONFIG_AGP_SWORKS=m @@ -1072,6 +1080,11 @@ # CONFIG_HANGCHECK_TIMER is not set # +# TPM devices +# +# CONFIG_TCG_TPM is not set + +# # I2C support # CONFIG_I2C=m @@ -1095,11 +1108,11 @@ # CONFIG_I2C_ELEKTOR is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set CONFIG_I2C_ISA=m # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PIIX4 is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set # CONFIG_SCx200_ACB is not set @@ -1123,7 +1136,9 @@ # CONFIG_SENSORS_ASB100 is not set # CONFIG_SENSORS_DS1621 is not set # CONFIG_SENSORS_FSCHER is not set +CONFIG_SENSORS_FSCPOS=m # CONFIG_SENSORS_GL518SM is not set +CONFIG_SENSORS_GL520SM=m # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_LM63 is not set # CONFIG_SENSORS_LM75 is not set @@ -1134,9 +1149,11 @@ # CONFIG_SENSORS_LM85 is not set # CONFIG_SENSORS_LM87 is not set # CONFIG_SENSORS_LM90 is not set +CONFIG_SENSORS_LM92=m # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_PC87360 is not set CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SIS5595=m # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_VIA686A is not set # CONFIG_SENSORS_W83781D is not set @@ -1146,6 +1163,7 @@ # # Other I2C Chip support # +CONFIG_SENSORS_DS1337=m # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCF8591 is not set @@ -1179,6 +1197,11 @@ # Graphics support # CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SOFT_CURSOR=y +# CONFIG_FB_MACMODES is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_CIRRUS is not set @@ -1190,6 +1213,7 @@ CONFIG_FB_VESA=y CONFIG_VIDEO_SELECT=y # CONFIG_FB_HGA 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 @@ -1206,6 +1230,8 @@ # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_PM3 is not set +# CONFIG_FB_GEODE is not set +# CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set # @@ -1236,6 +1262,8 @@ # # USB support # +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB=y # CONFIG_USB_DEBUG is not set @@ -1247,8 +1275,6 @@ # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y # # USB Host Controller Drivers @@ -1257,6 +1283,8 @@ # CONFIG_USB_EHCI_SPLIT_ISO is not set # CONFIG_USB_EHCI_ROOT_HUB_TT is not set CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set @@ -1272,12 +1300,11 @@ # CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_USB_STORAGE_RW_DETECT is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set # CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set -# CONFIG_USB_STORAGE_HP8200e is not set +# CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set @@ -1303,7 +1330,6 @@ # # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set -# CONFIG_USB_HPUSBSCSI is not set # # USB Multimedia devices @@ -1346,6 +1372,8 @@ # USB Network Adapters # CONFIG_USB_AX8817X=y +CONFIG_USB_ZD1201=m +CONFIG_USB_MON=y # # USB port drivers @@ -1357,9 +1385,11 @@ # CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRPRIME=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +# CONFIG_USB_SERIAL_CP2101 is not set CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m @@ -1388,10 +1418,12 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_HP4X is not set # CONFIG_USB_SERIAL_SAFE is not set CONFIG_USB_SERIAL_TI=m # CONFIG_USB_SERIAL_CYBERJACK is not set CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_OPTION is not set # CONFIG_USB_SERIAL_OMNINET is not set CONFIG_USB_EZUSB=y @@ -1409,6 +1441,7 @@ # CONFIG_USB_PHIDGETKIT is not set # CONFIG_USB_PHIDGETSERVO is not set # CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_TEST is not set # @@ -1518,6 +1551,9 @@ # CONFIG_EFS_FS is not set # CONFIG_CRAMFS is not set CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_SQUASHFS_VMALLOC is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -1611,12 +1647,11 @@ # # Kernel hacking # +CONFIG_PRINTK_TIME=y # CONFIG_DEBUG_KERNEL is not set -CONFIG_DEBUG_PREEMPT=y +CONFIG_LOG_BUF_SHIFT=15 CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_FRAME_POINTER is not set CONFIG_EARLY_PRINTK=y -# CONFIG_4KSTACKS is not set CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y @@ -1638,6 +1673,7 @@ # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set Modified: x86/trunk/packages/linux/Makefile =================================================================== --- x86/trunk/packages/linux/Makefile 2005-08-02 20:17:28 UTC (rev 507) +++ x86/trunk/packages/linux/Makefile 2005-08-02 20:48:08 UTC (rev 508) @@ -1,40 +1,72 @@ # Linux Kernel Makefile +#============================================================================== -# Package versions NM= linux VRS= $(KVERS) DIR= $(NM)-$(VRS) + FILE= $(DIR).tar.bz2 -PATCH1= squashfs2.1-patch -URL= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) -#URL1= http://ftp.roedu.net/pub/mirrors/ftp.namesys.com/pub/reiser4-for-2.6/2.6.11/broken-out -URL1= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.11/broken-out +URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) +SHA-$(FILE)= 958a751d9c73cc56bf2c3ffecd3537ef613b0076 -#RULES +PATCH1= reiser4-for-2.6.12-3.patch.gz +URL-$(PATCH1)= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.12/$(PATCH1) +SHA-$(PATCH1)= a56513748661db102d75a576d053f6bd78fd2294 -.PHONY: clean chroot stage2 +PATCH2= squashfs2.2-patch +# Targets +# ============================================================================= + +include $(ROOT)/scripts/functions + chroot: - @chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' + @chroot "$(MP)" $(chenv-blfs) \ + 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' -stage2: - @echo "" - @echo "=====> Building $(NM) in chroot" - @echo "" - @-mkdir /boot/isolinux - @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && mv $(FILE) $(SRC) ; fi - @if [ ! -f /boot/isolinux/linux ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \ - if [ ! -f ../serie ] ; then $(WGET) $(URL1).2/serie && mv serie ../ ; fi && \ - for i in `cat ../serie` ; do if [ ! -f ../$$i ] ; then $(WGET) $(URL1).2/$$i && \ - mv $$i ../ ; fi && patch -Np1 -i ../$$i ; done && \ - patch -Np1 -i $(ROOT)/$(PKG)/squashfs/squashfs2.1/linux-2.6.9/$(PATCH1) && \ - make mrproper && \ - cp $(ROOT)/linux/config .config && \ - make -j3 && \ - make modules_install && \ - cp arch/i386/boot/bzImage /boot/isolinux/linux && \ - cd .. && ./debian-style-headers.sh linux-$(KVERS) ; fi - @make clean +stage2: Makefile $(FILE) $(PATCH1) + @$(std_build) + @cp $(SRC)/$(FILE) $(LFSSRC)/ +compile-stage2: + @$(call echo_message, Configuring) +#============================================================================== +# Configure commands below \/ +#============================================================================== + @if [ ! -d /boot/isolinux ] ; then mkdir /boot/isolinux ; fi + @zcat ../$(PATCH1) > ../reiser4.patch + @patch -Np1 -i ../reiser4.patch + @patch -Np1 -i $(ROOT)/$(PKG)/squashfs/squashfs2.2/linux-2.6.12/$(PATCH2) + @make mrproper + @cp $(ROOT)/linux/config .config +# +#==Status Messages========================================== +# + @$(OK) + @$(call echo_message, Making) +#============================================================================== +# Make commands below \/ +#============================================================================== + @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1 +# +#==Status Messages=========================================== +# + @$(OK) + @$(call echo_message, Installing) +#============================================================================== +# Install commands below \/ +#============================================================================== + @make modules_install >>../$(DIR)[EMAIL PROTECTED] 2>&1 + @cp -v arch/i386/boot/bzImage /boot/isolinux/linux \ + >>../$(DIR)[EMAIL PROTECTED] 2>&1 + @cd .. ; ./debian-style-headers.sh linux-$(KVERS) \ + >>../$(DIR)[EMAIL PROTECTED] 2>&1 +# +#==Status Messages=========================================== +# + @$(OK) + clean: @-rm -rf $(DIR) + +.PHONY: clean chroot compile-stage2 -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
