Author: jhuntwork
Date: 2007-08-15 17:05:52 -0600 (Wed, 15 Aug 2007)
New Revision: 2027
Added:
branches/minimal/packages/jfsutils/
branches/minimal/packages/linux/config.rt2x00
branches/minimal/packages/linux/rt2x00-fixes-1.patch
branches/minimal/packages/linux64/config.rt2x00
branches/minimal/packages/linux64/rt2x00-fixes-1.patch
Modified:
branches/minimal/Makefile
branches/minimal/doc/README
branches/minimal/isolinux/options4.msg
branches/minimal/packages/initramfs/Makefile
branches/minimal/packages/linux/Makefile
branches/minimal/packages/linux/config.x86
branches/minimal/packages/linux64/Makefile
branches/minimal/packages/linux64/config.x86_64
branches/minimal/packages/net-firmware/Makefile
branches/minimal/packages/pidgin/Makefile
Log:
Merged r2021, r2022, r2023, r2024, r2025 & r2026 to minimal branch from trunk
Modified: branches/minimal/Makefile
===================================================================
--- branches/minimal/Makefile 2007-08-15 16:00:15 UTC (rev 2026)
+++ branches/minimal/Makefile 2007-08-15 23:05:52 UTC (rev 2027)
@@ -266,7 +266,7 @@
ch-sysvinit ch-tar ch-texinfo ch-udev ch-util-linux ch-vim \
final-environment
-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \
+blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-jfsutils ch-nano
ch-joe \
ch-screen ch-pkgconfig ch-libidn ch-libgpg-error ch-libgcrypt \
ch-gnutls ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml
ch-libxslt \
Modified: branches/minimal/doc/README
===================================================================
--- branches/minimal/doc/README 2007-08-15 16:00:15 UTC (rev 2026)
+++ branches/minimal/doc/README 2007-08-15 23:05:52 UTC (rev 2027)
@@ -70,6 +70,9 @@
(A tool for extracting commands from the Linux From Scratch book and creating
Makefiles that can download, check and build each LFS package for you.)
+You can compile other programs from sources directly on the CD. All locations
+on the CD can be written to (including /usr).
+
VMWARE ISSUE
===========================
This CD does not detect virtual SCSI disks connected to a virtual machine in
@@ -92,6 +95,18 @@
type "linux nodhcp" at the boot loader prompt. This may be required for
wireless connections that utilize WEP or WPA encryption.
+Users of wireless cards based on the Atheros chipset have to install the
+proprietary "madwifi" driver. The driver is provided in the precompiled form
+in the /drivers directory (if you loaded the CD contents to RAM, you have to
+mount the CD and look into /media/cdrom/drivers instead). To install it,
+run the following commands:
+
+cd /drivers
+tar -C / -xf madwifi-[version]-kernel-[kernel_version].tgz
+tar -C / -xf madwifi-[version]-tools.tgz
+depmod -ae
+modprobe ath_pci
+
CONFIGURING X
===========================
The LiveCD attempts to configure X for your video card automatically. The
@@ -419,7 +434,7 @@
1) Store the ISO image of this CD as a file on a partition formatted with
one of the following filesystems:
- vfat, ntfs, ext2, ext3, ext4, reiserfs, reiser4, xfs
+ vfat, ntfs, ext2, ext3, ext4, jfs, reiserfs, reiser4, xfs
2) Copy the boot/isolinux/{linux,initramfs_data.cpio.gz} files from the CD
to your hard disk
3) Configure the boot loader to load "linux" as a kernel image and
Modified: branches/minimal/isolinux/options4.msg
===================================================================
--- branches/minimal/isolinux/options4.msg 2007-08-15 16:00:15 UTC (rev
2026)
+++ branches/minimal/isolinux/options4.msg 2007-08-15 23:05:52 UTC (rev
2027)
@@ -12,6 +12,6 @@
brltty=drv[,dev[,tbl]]
Example: brltty=bm,usb:
- Enables a refreshable Braille display supported by reiver drv, connected to
+ Enables a refreshable Braille display supported by driver drv, connected to
device dev, with a translation table tbl. The example specifies a BAUM
SuperVario 40 Braille display connected by USB with default Braille table.
Modified: branches/minimal/packages/initramfs/Makefile
===================================================================
--- branches/minimal/packages/initramfs/Makefile 2007-08-15 16:00:15 UTC
(rev 2026)
+++ branches/minimal/packages/initramfs/Makefile 2007-08-15 23:05:52 UTC
(rev 2027)
@@ -44,7 +44,7 @@
cp /usr/bin/stat $(WDIR)/bin
cp /usr/sbin/dmsetup $(WDIR)/sbin
find
/lib/modules/*/kernel/drivers/{ata,base,block,cdrom,ide,ieee1394,firewire,hid,message,scsi,pcmcia,usb/{core,host,storage}}
\
-
/lib/modules/*/kernel/fs/{mbcache.ko,ext2,ext3,ext4,jbd,jbd2,reiserfs,reiser4,xfs,fat,vfat,ntfs,isofs,udf,nls}
\
+
/lib/modules/*/kernel/fs/{mbcache.ko,ext2,ext3,ext4,jbd,jbd2,jfs,reiserfs,reiser4,xfs,fat,vfat,ntfs,isofs,udf,nls}
\
/lib/modules/*/kernel/lib -type f | cpio --make-directories -p
$(WDIR)
for a in /lib/modules/* ; do ver=$${a##*/} ; depmod -b $(WDIR) $$ver ;
done
cd $(WDIR); find . | cpio -o -H newc | gzip -9 >
../initramfs_data.cpio.gz
Copied: branches/minimal/packages/jfsutils (from rev 2025,
trunk/packages/jfsutils)
Modified: branches/minimal/packages/linux/Makefile
===================================================================
--- branches/minimal/packages/linux/Makefile 2007-08-15 16:00:15 UTC (rev
2026)
+++ branches/minimal/packages/linux/Makefile 2007-08-15 23:05:52 UTC (rev
2027)
@@ -12,8 +12,33 @@
URL-$(PATCH1)= ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/$(PATCH1)
SHA-$(PATCH1)= a49f8a6d9851915c31f4c44e00519e0e4d2461c7
+# Undoes some upstream changes that are needed for linux-2.6.23-rcX
+# but break the build with 2.6.22
+PATCH2= rt2x00-fixes-1.patch
+
PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
+DIR5= mac80211-9.0.4
+FILE5= $(DIR5).tgz
+URL-$(FILE5)= http://intellinuxwireless.org/mac80211/downloads/$(FILE5)
+SHA-$(FILE5)= c15acff74a7c736cdb997546083f1e34278c6387
+
+DIR6= iwlwifi-1.0.0-1
+FILE6= $(DIR6).tgz
+URL-$(FILE6)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE6)
+SHA-$(FILE6)= 879a636b63cd1c8aebc8bc1a6205656b491107bb
+
+DIR7= rt2x00-cvs-2007081406
+FILE7= $(DIR7).tar.gz
+# Originally from http://rt2x00.serialmonkey.com/rt2x00-cvs-daily.tar.gz
+URL-$(FILE7)= http://www.linuxfromscratch.org/~alexander/$(FILE7)
+SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b
+
+DIR8= madwifi-0.9.3.2
+FILE8= $(DIR8).tar.bz2
+URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8)
+SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6
+
# Targets
include $(ROOT)/scripts/functions
@@ -22,10 +47,12 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(PATCH1)
$(std_build)
compile-stage2:
+ tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel
+ tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel
zcat ../$(PATCH1) | patch -Np1
patch -Np1 -i ../$(PATCH3)
install -d /boot/isolinux
@@ -34,6 +61,17 @@
make
make modules_install
cp -v arch/i386/boot/bzImage /boot/isolinux/linux
+ tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \
+ sed -i '/depmod/d' Makefile ; \
+ patch -Np0 -i ../../$(PATCH2) ; make KERNDIR=`pwd`/.. ; \
+ make KERNDIR=`pwd`/.. install
+ tar xf ../$(FILE8) ; cd $(DIR8) ; \
+ make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/.. ; \
+ make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/..
DESTDIR=`pwd`/DESTDIR-modules install-modules ; \
+ make BINDIR=/usr/bin MANDIR=/usr/share/man KERNELPATH=`pwd`/..
DESTDIR=`pwd`/DESTDIR-tools install-tools ; \
+ cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ;
cd .. ; \
+ cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz .
+ mv *.tgz /drivers
cd .. ; ./debian-style-headers.sh $(DIR)
clean:
Copied: branches/minimal/packages/linux/config.rt2x00 (from rev 2022,
trunk/packages/linux/config.rt2x00)
===================================================================
--- branches/minimal/packages/linux/config.rt2x00
(rev 0)
+++ branches/minimal/packages/linux/config.rt2x00 2007-08-15 23:05:52 UTC
(rev 2027)
@@ -0,0 +1,79 @@
+# rt2x00 configuration
+# All configuration options can be enabled
+# by setting the value to 'y'. To disable
+# the option it should be set to 'n'.
+
+#
+# RT2X00 generic support
+#
+
+# Enable rt2x00 support
+CONFIG_RT2X00=y
+# Enable rt2x00 debug output
+CONFIG_RT2X00_DEBUG=y
+# Enable rt2x00 debugfs support
+CONFIG_RT2X00_LIB_DEBUGFS=n
+# Enable rt2x00 asm file creation
+CONFIG_RT2X00_ASM=n
+
+#
+# RT2X00 driver support
+#
+# Enable rt2400pci support
+CONFIG_RT2400PCI=y
+# Enable rt2400pci hardware button support (requires rfkill)
+CONFIG_RT2400PCI_BUTTON=y
+
+# Enable rt2500pci support
+CONFIG_RT2500PCI=y
+# Enable rt2500pci hardware button support (requires rfkill)
+CONFIG_RT2500PCI_BUTTON=y
+
+# Enable rt2500usb support
+CONFIG_RT2500USB=y
+
+# Enable rt61pci support
+CONFIG_RT61PCI=y
+# Enable rt61pci hardware button support (requires rfkill)
+CONFIG_RT61PCI_BUTTON=y
+
+# Enable rt73usb support
+CONFIG_RT73USB=y
+
+#
+# Dscape ieee80211 stack
+#
+
+# Build dscape ieee80211 stack support
+CONFIG_D80211=y
+# Enable dscape ieee80211 debug output
+CONFIG_D80211_DEBUG=y
+# Enable dscape ieee80211 asm file creation
+CONFIG_D80211_ASM=n
+
+#
+# CRC-ITU-T support
+#
+
+# Enable crc-itu-t support
+CONFIG_CRC_ITU_T=y
+# Enable crc-itu-t asm file creation
+CONFIG_CRC_ITU_T_ASM=n
+
+#
+# EEPROM 93Cx6 support
+#
+
+# Enable eeprom_93Cx6 support
+CONFIG_EEPROM_93CX6=y
+# Enable eeprom asm file creation
+CONFIG_EEPROM_93CX6_ASM=n
+
+#
+# RFkill support
+#
+
+# Enable rfkill support
+CONFIG_RFKILL=y
+# Enable rfkill asm file creation
+CONFIG_RFKILL_ASM=n
Modified: branches/minimal/packages/linux/config.x86
===================================================================
--- branches/minimal/packages/linux/config.x86 2007-08-15 16:00:15 UTC (rev
2026)
+++ branches/minimal/packages/linux/config.x86 2007-08-15 23:05:52 UTC (rev
2027)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.1
-# Wed Aug 1 18:31:58 2007
+# Linux kernel version: 2.6.22.2
+# Wed Aug 15 17:47:27 2007
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
@@ -362,6 +362,8 @@
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_ASK_IP_FIB_HASH is not set
+# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
@@ -377,9 +379,16 @@
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_DEFAULT_BIC is not set
+# CONFIG_DEFAULT_CUBIC is not set
+# CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_WESTWOOD is not set
+# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IP_VS is not set
@@ -464,9 +473,56 @@
#
# QoS and/or fair queueing
#
-# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCHED=y
CONFIG_NET_SCH_FIFO=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+# CONFIG_NET_SCH_NETEM is not set
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_PEDIT=m
+# CONFIG_NET_ACT_SIMP is not set
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_ESTIMATOR=y
#
# Network testing
@@ -568,6 +624,7 @@
# Wireless
#
CONFIG_CFG80211=m
+CONFIG_NL80211=y
CONFIG_WIRELESS_EXT=y
CONFIG_MAC80211=m
# CONFIG_MAC80211_DEBUG is not set
@@ -1003,6 +1060,7 @@
# Network device support
#
CONFIG_NETDEVICES=y
+# CONFIG_IFB is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
@@ -1202,6 +1260,10 @@
# CONFIG_BCM43XX_PIO_MODE is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_IWLWIFI=y
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
#
# USB Network Adapters
Copied: branches/minimal/packages/linux/rt2x00-fixes-1.patch (from rev 2022,
trunk/packages/linux/rt2x00-fixes-1.patch)
===================================================================
--- branches/minimal/packages/linux/rt2x00-fixes-1.patch
(rev 0)
+++ branches/minimal/packages/linux/rt2x00-fixes-1.patch 2007-08-15
23:05:52 UTC (rev 2027)
@@ -0,0 +1,16 @@
+--- rt2x00mac.c
++++ rt2x00mac.c
+@@ -56,11 +56,11 @@
+ skb_put(skb, size);
+
+ if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
+- ieee80211_ctstoself_get(rt2x00dev->hw, rt2x00dev->interface.id,
++ ieee80211_ctstoself_get(rt2x00dev->hw,
+ frag_skb->data, frag_skb->len, control,
+ (struct ieee80211_cts *)(skb->data));
+ else
+- ieee80211_rts_get(rt2x00dev->hw, rt2x00dev->interface.id,
++ ieee80211_rts_get(rt2x00dev->hw,
+ frag_skb->data, frag_skb->len, control,
+ (struct ieee80211_rts *)(skb->data));
+
Modified: branches/minimal/packages/linux64/Makefile
===================================================================
--- branches/minimal/packages/linux64/Makefile 2007-08-15 16:00:15 UTC (rev
2026)
+++ branches/minimal/packages/linux64/Makefile 2007-08-15 23:05:52 UTC (rev
2027)
@@ -12,8 +12,40 @@
URL-$(PATCH1)= ftp://ftp.namesys.com/pub/reiser4-for-2.6/2.6.22/$(PATCH1)
SHA-$(PATCH1)= a49f8a6d9851915c31f4c44e00519e0e4d2461c7
+# Undoes some upstream changes that are needed for linux-2.6.23-rcX
+# but break the build with 2.6.22
+PATCH2= rt2x00-fixes-1.patch
+
PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
+DIR5= mac80211-9.0.4
+FILE5= $(DIR5).tgz
+URL-$(FILE5)= http://intellinuxwireless.org/mac80211/downloads/$(FILE5)
+SHA-$(FILE5)= c15acff74a7c736cdb997546083f1e34278c6387
+
+DIR6= iwlwifi-1.0.0-1
+FILE6= $(DIR6).tgz
+URL-$(FILE6)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE6)
+SHA-$(FILE6)= 879a636b63cd1c8aebc8bc1a6205656b491107bb
+
+DIR7= rt2x00-cvs-2007081406
+FILE7= $(DIR7).tar.gz
+# Originally from http://rt2x00.serialmonkey.com/rt2x00-cvs-daily.tar.gz
+URL-$(FILE7)= http://www.linuxfromscratch.org/~alexander/$(FILE7)
+SHA-$(FILE7)= 3eba4dc8e08ce256280adff492b541bda9c0198b
+
+DIR8= madwifi-0.9.3.2
+FILE8= $(DIR8).tar.bz2
+URL-$(FILE8)= http://easynews.dl.sourceforge.net/sourceforge/madwifi/$(FILE8)
+SHA-$(FILE8)= ccd8f4ba267df75ca002d8dbf66b09347e1bc0b6
+
+ifeq ($(CD_ARCH),x86)
+CROSS_MAKE= PATH=$$PATH:$(WD)/bin make ARCH=x86_64
CROSS_COMPILE=x86_64-unknown-linux-gnu-
+endif
+ifeq ($(CD_ARCH),x86_64)
+CROSS_MAKE= make
+endif
+
# Targets
include $(ROOT)/scripts/functions
@@ -22,26 +54,42 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(PATCH1)
$(std_build)
compile-stage2:
+ tar xf ../$(FILE5) ; cd $(DIR5) ; make KSRC=.. patch_kernel
+ tar xf ../$(FILE6) ; cd $(DIR6) ; echo "Y" | make KSRC=.. patch_kernel
zcat ../$(PATCH1) | patch -Np1
patch -Np1 -i ../$(PATCH3)
install -d /boot/isolinux
make mrproper
cp ../config.x86_64 .config
+ $(CROSS_MAKE)
+ $(CROSS_MAKE) modules_install
+ tar xf ../$(FILE7) ; cd $(DIR7) ; cp ../../config.rt2x00 config ; \
+ sed -i '/depmod/d' Makefile ; \
+ patch -Np0 -i ../../$(PATCH2) ; \
+ $(CROSS_MAKE) KERNDIR=`pwd`/.. ; \
+ $(CROSS_MAKE) KERNDIR=`pwd`/.. install
ifeq ($(CD_ARCH),x86)
- PATH=$$PATH:$(WD)/bin make ARCH=x86_64
CROSS_COMPILE=x86_64-unknown-linux-gnu-
- PATH=$$PATH:$(WD)/bin make modules_install ARCH=x86_64
CROSS_COMPILE=x86_64-unknown-linux-gnu-
+ tar xf ../$(FILE8) ; cd $(DIR8) ; \
+ $(CROSS_MAKE) KERNELPATH=`pwd`/.. modules ; \
+ $(CROSS_MAKE) KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules
install-modules ; \
+ cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS)-64bit.tgz
.
rm /lib/modules/*-64bit/{source,build}
cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64
endif
ifeq ($(CD_ARCH),x86_64)
- make
- make modules_install
+ tar xf ../$(FILE8) ; cd $(DIR8) ; \
+ $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man
KERNELPATH=`pwd`/.. ; \
+ $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man
KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-modules install-modules ; \
+ $(CROSS_MAKE) BINDIR=/usr/bin MANDIR=/usr/share/man
KERNELPATH=`pwd`/.. DESTDIR=`pwd`/DESTDIR-tools install-tools ; \
+ cd DESTDIR-modules ; tar zcvf ../../$(DIR8)-kernel-$(VRS).tgz . ;
cd .. ; \
+ cd DESTDIR-tools ; tar zcvf ../../$(DIR8)-tools.tgz .
cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux
endif
+ mv *.tgz /drivers
clean:
-rm -rf $(DIR)
Copied: branches/minimal/packages/linux64/config.rt2x00 (from rev 2022,
trunk/packages/linux64/config.rt2x00)
===================================================================
--- branches/minimal/packages/linux64/config.rt2x00
(rev 0)
+++ branches/minimal/packages/linux64/config.rt2x00 2007-08-15 23:05:52 UTC
(rev 2027)
@@ -0,0 +1,79 @@
+# rt2x00 configuration
+# All configuration options can be enabled
+# by setting the value to 'y'. To disable
+# the option it should be set to 'n'.
+
+#
+# RT2X00 generic support
+#
+
+# Enable rt2x00 support
+CONFIG_RT2X00=y
+# Enable rt2x00 debug output
+CONFIG_RT2X00_DEBUG=y
+# Enable rt2x00 debugfs support
+CONFIG_RT2X00_LIB_DEBUGFS=n
+# Enable rt2x00 asm file creation
+CONFIG_RT2X00_ASM=n
+
+#
+# RT2X00 driver support
+#
+# Enable rt2400pci support
+CONFIG_RT2400PCI=y
+# Enable rt2400pci hardware button support (requires rfkill)
+CONFIG_RT2400PCI_BUTTON=y
+
+# Enable rt2500pci support
+CONFIG_RT2500PCI=y
+# Enable rt2500pci hardware button support (requires rfkill)
+CONFIG_RT2500PCI_BUTTON=y
+
+# Enable rt2500usb support
+CONFIG_RT2500USB=y
+
+# Enable rt61pci support
+CONFIG_RT61PCI=y
+# Enable rt61pci hardware button support (requires rfkill)
+CONFIG_RT61PCI_BUTTON=y
+
+# Enable rt73usb support
+CONFIG_RT73USB=y
+
+#
+# Dscape ieee80211 stack
+#
+
+# Build dscape ieee80211 stack support
+CONFIG_D80211=y
+# Enable dscape ieee80211 debug output
+CONFIG_D80211_DEBUG=y
+# Enable dscape ieee80211 asm file creation
+CONFIG_D80211_ASM=n
+
+#
+# CRC-ITU-T support
+#
+
+# Enable crc-itu-t support
+CONFIG_CRC_ITU_T=y
+# Enable crc-itu-t asm file creation
+CONFIG_CRC_ITU_T_ASM=n
+
+#
+# EEPROM 93Cx6 support
+#
+
+# Enable eeprom_93Cx6 support
+CONFIG_EEPROM_93CX6=y
+# Enable eeprom asm file creation
+CONFIG_EEPROM_93CX6_ASM=n
+
+#
+# RFkill support
+#
+
+# Enable rfkill support
+CONFIG_RFKILL=y
+# Enable rfkill asm file creation
+CONFIG_RFKILL_ASM=n
Modified: branches/minimal/packages/linux64/config.x86_64
===================================================================
--- branches/minimal/packages/linux64/config.x86_64 2007-08-15 16:00:15 UTC
(rev 2026)
+++ branches/minimal/packages/linux64/config.x86_64 2007-08-15 23:05:52 UTC
(rev 2027)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.1
-# Sat Jul 21 16:08:05 2007
+# Linux kernel version: 2.6.22.2
+# Wed Aug 15 17:47:27 2007
#
CONFIG_X86_64=y
CONFIG_64BIT=y
@@ -303,6 +303,8 @@
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_ASK_IP_FIB_HASH is not set
+# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
@@ -318,9 +320,16 @@
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_CUBIC=y
+# CONFIG_DEFAULT_BIC is not set
+# CONFIG_DEFAULT_CUBIC is not set
+# CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_WESTWOOD is not set
+# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
# CONFIG_IP_VS is not set
@@ -447,9 +456,56 @@
#
# QoS and/or fair queueing
#
-# CONFIG_NET_SCHED is not set
+CONFIG_NET_SCHED=y
CONFIG_NET_SCH_FIFO=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+# CONFIG_NET_SCH_NETEM is not set
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_PEDIT=m
+# CONFIG_NET_ACT_SIMP is not set
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_ESTIMATOR=y
#
# Network testing
@@ -550,6 +606,7 @@
# Wireless
#
CONFIG_CFG80211=m
+CONFIG_NL80211=y
CONFIG_WIRELESS_EXT=y
CONFIG_MAC80211=m
# CONFIG_MAC80211_DEBUG is not set
@@ -945,6 +1002,7 @@
# Network device support
#
CONFIG_NETDEVICES=y
+# CONFIG_IFB is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
@@ -1111,6 +1169,10 @@
# CONFIG_BCM43XX_PIO_MODE is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_IWLWIFI=y
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
#
# USB Network Adapters
Copied: branches/minimal/packages/linux64/rt2x00-fixes-1.patch (from rev 2022,
trunk/packages/linux64/rt2x00-fixes-1.patch)
===================================================================
--- branches/minimal/packages/linux64/rt2x00-fixes-1.patch
(rev 0)
+++ branches/minimal/packages/linux64/rt2x00-fixes-1.patch 2007-08-15
23:05:52 UTC (rev 2027)
@@ -0,0 +1,16 @@
+--- rt2x00mac.c
++++ rt2x00mac.c
+@@ -56,11 +56,11 @@
+ skb_put(skb, size);
+
+ if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
+- ieee80211_ctstoself_get(rt2x00dev->hw, rt2x00dev->interface.id,
++ ieee80211_ctstoself_get(rt2x00dev->hw,
+ frag_skb->data, frag_skb->len, control,
+ (struct ieee80211_cts *)(skb->data));
+ else
+- ieee80211_rts_get(rt2x00dev->hw, rt2x00dev->interface.id,
++ ieee80211_rts_get(rt2x00dev->hw,
+ frag_skb->data, frag_skb->len, control,
+ (struct ieee80211_rts *)(skb->data));
+
Modified: branches/minimal/packages/net-firmware/Makefile
===================================================================
--- branches/minimal/packages/net-firmware/Makefile 2007-08-15 16:00:15 UTC
(rev 2026)
+++ branches/minimal/packages/net-firmware/Makefile 2007-08-15 23:05:52 UTC
(rev 2027)
@@ -72,6 +72,31 @@
URL-$(FILE15)= http://www.sigmatel.com/documents/$(FILE15)
SHA-$(FILE15)= bee20b114e3f29c28819ec6a716472621bf6ac47
+DIR16= RT61_Firmware_V1.2
+FILE16= $(DIR16).zip
+URL-$(FILE16)= http://www.ralinktech.com.tw/data/$(FILE16)
+SHA-$(FILE16)= fded9f76ce620595b876b23b6a8c416af596dc5b
+
+DIR17= RT71W_Firmware_V1.8
+FILE17= $(DIR17).zip
+URL-$(FILE17)= http://www.ralinktech.com.tw/data/$(FILE17)
+SHA-$(FILE17)= 8f40bd8448c136e7edcc005f45e657258085ab8e
+
+DIR18= iwlwifi-3945-ucode-2.14.1.5
+FILE18= $(DIR18).tgz
+URL-$(FILE18)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE18)
+SHA-$(FILE18)= aeeeccb2fddeff86ee7dbdca0f0d627d0c99d45c
+
+DIR19= iwlwifi-4965-ucode-4.44.1.18
+FILE19= $(DIR19).tgz
+URL-$(FILE19)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE19)
+SHA-$(FILE19)= 01bf0264cfc4f60957a7242264050a81c56858bf
+
+DIR20= iwlwifi-4965-ucode-4.44.17
+FILE20= $(DIR20).tgz
+URL-$(FILE20)= http://intellinuxwireless.org/iwlwifi/downloads/$(FILE20)
+SHA-$(FILE20)= 955d8718419dc2670d9b8167e22df118a36666a5
+
ALLFILES= $(foreach FILE,$(sort $(filter FILE%,$(.VARIABLES))),$($(FILE)))
# Targets
@@ -100,6 +125,11 @@
./get_symbol_fw ; cp symbol_* /lib/firmware
@cp $(FILE14) /lib/firmware/usb8388.bin
@mkdir $(DIR15) ; cd $(DIR15) ; tar xf ../$(FILE15) ; install -m 644
*.sb /lib/firmware
+ @unzip $(FILE16) ; cp $(DIR16)/*.bin /lib/firmware
+ @unzip $(FILE17) ; cp $(DIR17)/*.bin /lib/firmware
+ @tar xf $(FILE18) ; cp $(DIR18)/* /lib/firmware
+ @tar xf $(FILE19) ; cp $(DIR19)/* /lib/firmware
+ @tar xf $(FILE20) ; cp $(DIR20)/* /lib/firmware
@make clean
@touch $@
Modified: branches/minimal/packages/pidgin/Makefile
===================================================================
--- branches/minimal/packages/pidgin/Makefile 2007-08-15 16:00:15 UTC (rev
2026)
+++ branches/minimal/packages/pidgin/Makefile 2007-08-15 23:05:52 UTC (rev
2027)
@@ -1,12 +1,12 @@
# pidgin Makefile
NM= pidgin
-VRS= 2.0.2
+VRS= 2.1.0
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= http://puzzle.dl.sourceforge.net/sourceforge/pidgin/$(FILE)
-SHA-$(FILE)= 7f5cdc3e8fb8b8af9646bb0635b2852c24f7e059
+SHA-$(FILE)= 33f78d07c3c7797a710bb7d2032a8d0bd89a6ab3
# Targets
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
