r1478 - in branches/udev_update: . packages packages/linux packages/pcmcia-cs packages/pcmciautils packages/sysfsutils packages/udev

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Thu Apr 13 02:32:40 PDT 2006


Author: alexander
Date: 2006-04-13 03:32:35 -0600 (Thu, 13 Apr 2006)
New Revision: 1478

Added:
   branches/udev_update/packages/pcmcia-cs/
   branches/udev_update/packages/pcmcia-cs/Makefile
   branches/udev_update/packages/pcmciautils/
   branches/udev_update/packages/pcmciautils/Makefile
   branches/udev_update/packages/sysfsutils/
   branches/udev_update/packages/sysfsutils/Makefile
Modified:
   branches/udev_update/Makefile
   branches/udev_update/packages/linux/config.ppc
   branches/udev_update/packages/linux/config.ppc.ata
   branches/udev_update/packages/linux/config.sparc
   branches/udev_update/packages/linux/config.sparc.ata
   branches/udev_update/packages/linux/config.x86
   branches/udev_update/packages/linux/config.x86.ata
   branches/udev_update/packages/linux/config.x86_64
   branches/udev_update/packages/linux/config.x86_64.ata
   branches/udev_update/packages/udev/Makefile
Log:
Added PCMCIA support (draft!)
Since it is modular, booting from PCMCIA CD-ROMs will fail for now.
Building non-modular PCMCIA means issues with firmware loader (solvable if we drop the possibility of CIS overrides for broken cards).


Modified: branches/udev_update/Makefile
===================================================================
--- branches/udev_update/Makefile	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/Makefile	2006-04-13 09:32:35 UTC (rev 1478)
@@ -351,6 +351,7 @@
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
 	ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-BRLTTY \
 	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
+	ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \
 	ch-ctags ch-initramfs ch-zisofs-tools ch-cdrtools ch-blfs-bootscripts \
 	ch-man-fr ch-man-pages-es ch-man-pages-it ch-manpages-de ch-manpages-ru \
 	ch-anthy ch-scim ch-scim-tables ch-scim-anthy ch-scim-hangul \

Modified: branches/udev_update/packages/linux/config.ppc
===================================================================
--- branches/udev_update/packages/linux/config.ppc	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/packages/linux/config.ppc	2006-04-13 09:32:35 UTC (rev 1478)
@@ -200,28 +200,28 @@
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-CONFIG_PCCARD=y
+CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
 # CONFIG_PCMCIA_IOCTL is not set
 CONFIG_CARDBUS=y
 
 #
 # PC-card bridges
 #
-CONFIG_YENTA=y
+CONFIG_YENTA=m
 CONFIG_YENTA_O2=y
 CONFIG_YENTA_RICOH=y
 CONFIG_YENTA_TI=y
 CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=y
-CONFIG_I82092=y
-CONFIG_I82365=y
-CONFIG_TCIC=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=y
+CONFIG_PCCARD_NONSTATIC=m
 
 #
 # Advanced setup
@@ -1079,7 +1079,7 @@
 # Serial drivers
 #
 CONFIG_SERIAL_8250=m
-# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set

Modified: branches/udev_update/packages/linux/config.ppc.ata
===================================================================
--- branches/udev_update/packages/linux/config.ppc.ata	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/packages/linux/config.ppc.ata	2006-04-13 09:32:35 UTC (rev 1478)
@@ -200,28 +200,28 @@
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-CONFIG_PCCARD=y
+CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
 # CONFIG_PCMCIA_IOCTL is not set
 CONFIG_CARDBUS=y
 
 #
 # PC-card bridges
 #
-CONFIG_YENTA=y
+CONFIG_YENTA=m
 CONFIG_YENTA_O2=y
 CONFIG_YENTA_RICOH=y
 CONFIG_YENTA_TI=y
 CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=y
-CONFIG_I82092=y
-CONFIG_I82365=y
-CONFIG_TCIC=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=y
+CONFIG_PCCARD_NONSTATIC=m
 
 #
 # Advanced setup
@@ -1018,7 +1018,7 @@
 # Serial drivers
 #
 CONFIG_SERIAL_8250=m
-# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set

Modified: branches/udev_update/packages/linux/config.sparc
===================================================================
--- branches/udev_update/packages/linux/config.sparc	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/packages/linux/config.sparc	2006-04-13 09:32:35 UTC (rev 1478)
@@ -305,7 +305,7 @@
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 
 #
 # Connector - unified userspace <-> kernelspace linker

Modified: branches/udev_update/packages/linux/config.sparc.ata
===================================================================
--- branches/udev_update/packages/linux/config.sparc.ata	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/packages/linux/config.sparc.ata	2006-04-13 09:32:35 UTC (rev 1478)
@@ -305,7 +305,7 @@
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 
 #
 # Connector - unified userspace <-> kernelspace linker

Modified: branches/udev_update/packages/linux/config.x86
===================================================================
--- branches/udev_update/packages/linux/config.x86	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/packages/linux/config.x86	2006-04-13 09:32:35 UTC (rev 1478)
@@ -269,28 +269,28 @@
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-CONFIG_PCCARD=y
+CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
 # CONFIG_PCMCIA_IOCTL is not set
 CONFIG_CARDBUS=y
 
 #
 # PC-card bridges
 #
-CONFIG_YENTA=y
+CONFIG_YENTA=m
 CONFIG_YENTA_O2=y
 CONFIG_YENTA_RICOH=y
 CONFIG_YENTA_TI=y
 CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=y
-CONFIG_I82092=y
-CONFIG_I82365=y
-CONFIG_TCIC=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=y
+CONFIG_PCCARD_NONSTATIC=m
 
 #
 # PCI Hotplug Support
@@ -470,7 +470,7 @@
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -1147,7 +1147,7 @@
 #
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_CONSOLE is not set
-# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4

Modified: branches/udev_update/packages/linux/config.x86.ata
===================================================================
--- branches/udev_update/packages/linux/config.x86.ata	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/packages/linux/config.x86.ata	2006-04-13 09:32:35 UTC (rev 1478)
@@ -269,28 +269,28 @@
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-CONFIG_PCCARD=y
+CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
 # CONFIG_PCMCIA_IOCTL is not set
 CONFIG_CARDBUS=y
 
 #
 # PC-card bridges
 #
-CONFIG_YENTA=y
+CONFIG_YENTA=m
 CONFIG_YENTA_O2=y
 CONFIG_YENTA_RICOH=y
 CONFIG_YENTA_TI=y
 CONFIG_YENTA_ENE_TUNE=y
 CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=y
-CONFIG_I82092=y
-CONFIG_I82365=y
-CONFIG_TCIC=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=y
+CONFIG_PCCARD_NONSTATIC=m
 
 #
 # PCI Hotplug Support
@@ -470,7 +470,7 @@
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -1080,7 +1080,7 @@
 #
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_CONSOLE is not set
-# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4

Modified: branches/udev_update/packages/linux/config.x86_64
===================================================================
--- branches/udev_update/packages/linux/config.x86_64	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/packages/linux/config.x86_64	2006-04-13 09:32:35 UTC (rev 1478)
@@ -211,7 +211,7 @@
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
 CONFIG_PCMCIA=m
-# CONFIG_PCMCIA_LOAD_CIS is not set
+CONFIG_PCMCIA_LOAD_CIS=y
 # CONFIG_PCMCIA_IOCTL is not set
 CONFIG_CARDBUS=y
 
@@ -409,7 +409,7 @@
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -1016,7 +1016,7 @@
 #
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_CONSOLE is not set
-# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4

Modified: branches/udev_update/packages/linux/config.x86_64.ata
===================================================================
--- branches/udev_update/packages/linux/config.x86_64.ata	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/packages/linux/config.x86_64.ata	2006-04-13 09:32:35 UTC (rev 1478)
@@ -409,7 +409,7 @@
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -951,7 +951,7 @@
 #
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_CONSOLE is not set
-# CONFIG_SERIAL_8250_CS is not set
+CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_ACPI is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4

Added: branches/udev_update/packages/pcmcia-cs/Makefile
===================================================================
--- branches/udev_update/packages/pcmcia-cs/Makefile	                        (rev 0)
+++ branches/udev_update/packages/pcmcia-cs/Makefile	2006-04-13 09:32:35 UTC (rev 1478)
@@ -0,0 +1,30 @@
+# PCMCIS-CS Makefile
+
+# Is it OK to download a 1 MB package just for 10 KB of cis-files?
+NM= pcmcia-cs
+VRS= 3.2.8
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://pcmcia-cs.sourceforge.net/ftp/$(FILE)
+SHA-$(FILE)= 38ce295c2a6baed05d792141f60a01fe6770350e
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+	$(std_build)
+
+compile-stage2:
+	cd etc/cis ; rm *.cis ; rename .dat .cis *.dat
+	install -m644 etc/cis/*.cis /lib/firmware
+
+clean:
+	-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Added: branches/udev_update/packages/pcmciautils/Makefile
===================================================================
--- branches/udev_update/packages/pcmciautils/Makefile	                        (rev 0)
+++ branches/udev_update/packages/pcmciautils/Makefile	2006-04-13 09:32:35 UTC (rev 1478)
@@ -0,0 +1,30 @@
+# Sysfsutils Makefile
+
+NM= pcmciautils
+VRS= 013
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= http://www.kernel.org/pub/linux/utils/kernel/pcmcia/$(FILE)
+SHA-$(FILE)= 6e0a903232788c8e0405416c7e5c7b34e9d118d4
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+	$(std_build)
+
+compile-stage2:
+	>udev/rules-modprobe
+	make
+	make SYMLINK="ln -sf" install
+
+clean:
+	-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Added: branches/udev_update/packages/sysfsutils/Makefile
===================================================================
--- branches/udev_update/packages/sysfsutils/Makefile	                        (rev 0)
+++ branches/udev_update/packages/sysfsutils/Makefile	2006-04-13 09:32:35 UTC (rev 1478)
@@ -0,0 +1,30 @@
+# Sysfsutils Makefile
+
+NM= sysfsutils
+VRS= 2.0.0
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/linux-diag/$(FILE)
+SHA-$(FILE)= 98a3883acee893f0c8e88929200bc8e202a14bf8
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+	$(std_build)
+
+compile-stage2:
+	./configure --prefix=/usr
+	make $(PM)
+	make install
+
+clean:
+	-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: branches/udev_update/packages/udev/Makefile
===================================================================
--- branches/udev_update/packages/udev/Makefile	2006-04-07 07:55:25 UTC (rev 1477)
+++ branches/udev_update/packages/udev/Makefile	2006-04-13 09:32:35 UTC (rev 1478)
@@ -32,6 +32,7 @@
 	 EXTRAS="`echo extras/*/`"
 endif
 	make DESTDIR=/ EXTRAS="`echo extras/*/`" install
+	mkdir -p /lib/firmware
 	grep -v cdrom $(SRC)/$(CONFIG1) >/etc/udev/rules.d/25-lfs.rules
 	cp ../10-wait_for_sysfs.rules /etc/udev/rules.d/
 	echo 'ACTION=="add", BUS=="pci", SYSFS{class}=="0x030000", RUN+="detect-video"' >/etc/udev/rules.d/30-video.rules




More information about the livecd mailing list