Author: jhuntwork Date: 2005-02-21 08:17:11 -0700 (Mon, 21 Feb 2005) New Revision: 71
Added: branches/ppc/packages/parted/ branches/ppc/packages/parted/Makefile branches/ppc/packages/yaboot/ branches/ppc/packages/yaboot/Makefile branches/ppc/packages/yaboot/maps branches/ppc/packages/yaboot/yaboot-1.3.13-fix1.patch Removed: branches/ppc/uname/ Modified: branches/ppc/Makefile branches/ppc/linux/config branches/ppc/packages/LVM2/Makefile branches/ppc/packages/binutils/Makefile branches/ppc/packages/coreutils/Makefile branches/ppc/packages/dhcpcd/Makefile branches/ppc/packages/html_tidy/Makefile branches/ppc/packages/linux-libc-headers/Makefile branches/ppc/packages/linux/Makefile branches/ppc/packages/shadow/Makefile branches/ppc/packages/unzip/Makefile Log: First major revisal of ppc branch - most edits to port makefiles to ppc Modified: branches/ppc/Makefile =================================================================== --- branches/ppc/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -20,11 +20,6 @@ # Page size for groff export pagesize := letter -# Change this to 'n' if you don't want to use the -# uname module to build for i486. (Of course, the resultant -# cd will not be an official cd then ;) ) -UNAMEMOD= y - # Directory where your current compiled kernel source is located. # This is needed to be able to compile the uname module, if you # have left UNAMEMOD to its default 'y'. @@ -40,10 +35,10 @@ export ROOT := /lfs-livecd # Ftp server for the lfs-base packages -export FTP := ftp://ftp.lfs-matrix.de/pub/lfs/lfs-packages/conglomeration +export FTP := ftp://ftp.lfs-matrix.net/pub/lfs/lfs-packages/conglomeration # Don't edit these! -export VERSION=x86-6.1-1-pre3 +export VERSION=ppc-6.1-1-pre1 export HOSTNAME := lfslivecd export WD := /tools export SRC := /sources @@ -106,7 +101,6 @@ @echo " Building LFS Base System" @echo "==========================" @echo "" - @make unamemod @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) tools'" @if [ ! -f $(PKG)/wget/.pass2 ] ; then make lfs-rm-wget && make lfs-wget ; fi @touch $(PKG)/wget/.pass2 @@ -118,7 +112,7 @@ @cp $(WD)/bin/which $(MP)/usr/bin @chroot "$(MP)" $(chenv3) 'set +h && cd $(ROOT) && make blfs $(chbash2)' [EMAIL PROTECTED] "$(MP)" $(chenvstrip) 'set +h && cd $(ROOT) && make ch-strip' - @make unloadmodule + @ @make unmount lfsuser: @@ -145,16 +139,6 @@ chmod 755 $(FTPGET) ; fi @$(MAKE) -C $(PKG)/wget prebuild -unamemod: -ifeq ($(UNAMEMOD),y) - @if [ ! -f uname/uname_i486.ko ] ; then echo "" && echo "=====> Making Uname Module" && echo "" && \ - make -C $(LINUXSRC) SUBDIRS=$(MKTREE)/uname modules ; fi - @lsmod 1> $(WD)/.file - @if ! grep -q uname_i486 $(WD)/.file ; then insmod uname/uname_i486.ko ; fi - @-rm -f $(WD)/.file -else -endif - tools: pre-which pre-wget lfs-binutils-pass1-scpt lfs-gcc-pass1-scpt lfs-linux-libc-headers-scpt lfs-glibc-scpt \ lfs-adjust-toolchain-scpt lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2-scpt lfs-binutils-pass2-scpt \ lfs-gawk-scpt lfs-coreutils-scpt lfs-bzip2-scpt lfs-gzip-scpt lfs-diffutils-scpt lfs-findutils-scpt lfs-make-scpt \ @@ -175,7 +159,7 @@ ch-readline ch-vim ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex ch-gettext ch-inetutils \ ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash -post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs ch-grep ch-grub ch-gzip \ +post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs ch-grep ch-gzip \ ch-hotplug ch-man ch-make ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow ch-libol \ ch-syslog-ng ch-sysvinit ch-tar ch-udev ch-util-linux ch-environment @@ -185,108 +169,109 @@ ch-libtiff ch-links ch-openssh ch-pkgconfig ch-glib2 ch-libungif ch-imlib2 ch-pango ch-atk ch-gtk2 \ ch-libIDL ch-firefox ch-fluxbox ch-libast ch-Eterm ch-irssi ch-xchat ch-samba ch-tcpwrappers ch-portmap \ ch-nfs-utils ch-traceroute ch-nALFS ch-device-mapper ch-LVM2 ch-dhcpcd ch-libaal ch-reiser4progs \ - ch-squashfs ch-cpio ch-db ch-postfix ch-mutt ch-slrn ch-linux ch-cdrtools ch-blfs-bootscripts ch-syslinux + ch-squashfs ch-cpio ch-db ch-postfix ch-mutt ch-slrn ch-linux ch-cdrtools ch-blfs-bootscripts ch-yaboot \ + ch-parted # Rules for building tools/stage1 # These can be called individually, if necessary -lfs-wget: unamemod lfsuser +lfs-wget: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) pre-wget'" -lfs-rm-wget: unamemod lfsuser +lfs-rm-wget: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) &&rm $(WD)/bin/wget'" -lfs-binutils-pass1: unamemod lfsuser +lfs-binutils-pass1: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-binutils-pass1-scpt'" -lfs-gcc-pass1: unamemod lfsuser +lfs-gcc-pass1: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gcc-pass1-scpt'" -lfs-linux-libc-headers: unamemod lfsuser +lfs-linux-libc-headers: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-linux-libc-headers-scpt'" -lfs-glibc: unamemod lfsuser +lfs-glibc: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-glibc-scpt'" -lfs-adjust-toolchain: unamemod lfsuser +lfs-adjust-toolchain: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-adjust-toolchain-scpt'" -lfs-tcl: unamemod lfsuser +lfs-tcl: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-tcl-scpt'" -lfs-expect: unamemod lfsuser +lfs-expect: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-expect-scpt'" -lfs-dejagnu: unamemod lfsuser +lfs-dejagnu: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-dejagnu-scpt'" -lfs-gcc-pass2: unamemod lfsuser +lfs-gcc-pass2: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gcc-pass2-scpt'" -lfs-binutils-pass2: unamemod lfsuser +lfs-binutils-pass2: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-binutils-pass2-scpt'" -lfs-gawk: unamemod lfsuser +lfs-gawk: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gawk-scpt'" -lfs-coreutils: unamemod lfsuser +lfs-coreutils: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-coreutils-scpt'" -lfs-bzip2: unamemod lfsuser +lfs-bzip2: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-bzip2-scpt'" -lfs-gzip: unamemod lfsuser +lfs-gzip: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gzip-scpt'" -lfs-diffutils: unamemod lfsuser +lfs-diffutils: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-diffutils-scpt'" -lfs-findutils: unamemod lfsuser +lfs-findutils: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-findutils-scpt'" lfs-make: uanmemod lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-make-scpt'" -lfs-grep: unamemod lfsuser +lfs-grep: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-grep-scpt'" -lfs-sed: unamemod lfsuser +lfs-sed: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-sed-scpt'" -lfs-gettext: unamemod lfsuser +lfs-gettext: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-gettext-scpt'" -lfs-ncurses: unamemod lfsuser +lfs-ncurses: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-ncurses-scpt'" -lfs-patch: unamemod lfsuser +lfs-patch: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-patch-scpt'" -lfs-tar: unamemod lfsuser +lfs-tar: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-tar-scpt'" -lfs-texinfo: unamemod lfsuser +lfs-texinfo: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-texinfo-scpt'" -lfs-bash: unamemod lfsuser +lfs-bash: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-bash-scpt'" -lfs-m4: unamemod lfsuser +lfs-m4: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-m4-scpt'" -lfs-bison: unamemod lfsuser +lfs-bison: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-bison-scpt'" -lfs-flex: unamemod lfsuser +lfs-flex: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-flex-scpt'" -lfs-util-linux: unamemod lfsuser +lfs-util-linux: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-util-linux-scpt'" -lfs-perl: unamemod lfsuser +lfs-perl: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-perl-scpt'" -lfs-strip: unamemod lfsuser +lfs-strip: lfsuser @su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-strip-scpt'" @touch lfs-strip @@ -359,475 +344,479 @@ mount -t tmpfs none /dev/shm ; fi @if [ -f /sbin/udevstart ] ; then /sbin/udevstart ; fi -linux-libc-headers: unamemod prep-chroot +linux-libc-headers: prep-chroot make -C $(PKG)/$@ chroot make unmount -man-pages: unamemod prep-chroot +man-pages: prep-chroot make -C $(PKG)/$@ chroot make unmount -glibc: unamemod prep-chroot +glibc: prep-chroot make -C $(PKG)/$@ chroot make unmount -re-adjust-toolchain: unamemod prep-chroot +re-adjust-toolchain: prep-chroot make -C $(PKG)/binutils chroot-re-adjust-toolchain make unmount -binutils: unamemod prep-chroot +binutils: prep-chroot make -C $(PKG)/$@ chroot make unmount -gcc: unamemod prep-chroot +gcc: prep-chroot make -C $(PKG)/$@ chroot make unmount -coreutils: unamemod prep-chroot +coreutils: prep-chroot make -C $(PKG)/$@ chroot make unmount -zlib: unamemod prep-chroot +zlib: prep-chroot make -C $(PKG)/$@ chroot make unmount -mktemp: unamemod prep-chroot +mktemp: prep-chroot make -C $(PKG)/$@ chroot make unmount -iana-etc: unamemod prep-chroot +iana-etc: prep-chroot make -C $(PKG)/$@ chroot make unmount -findutils: unamemod prep-chroot +findutils: prep-chroot make -C $(PKG)/$@ chroot make unmount -gawk: unamemod prep-chroot +gawk: prep-chroot make -C $(PKG)/$@ chroot make unmount -ncurses: unamemod prep-chroot +ncurses: prep-chroot make -C $(PKG)/$@ chroot make unmount -readline: unamemod prep-chroot +readline: prep-chroot make -C $(PKG)/$@ chroot make unmount -vim: unamemod prep-chroot +vim: prep-chroot make -C $(PKG)/$@ chroot make unmount -m4: unamemod prep-chroot +m4: prep-chroot make -C $(PKG)/$@ chroot make unmount -bison: unamemod prep-chroot +bison: prep-chroot make -C $(PKG)/$@ chroot make unmount -less: unamemod prep-chroot +less: prep-chroot make -C $(PKG)/$@ chroot make unmount -groff: unamemod prep-chroot +groff: prep-chroot make -C $(PKG)/$@ chroot make unmount -sed: unamemod prep-chroot +sed: prep-chroot make -C $(PKG)/$@ chroot make unmount -flex: unamemod prep-chroot +flex: prep-chroot make -C $(PKG)/$@ chroot make unmount -gettext: unamemod prep-chroot +gettext: prep-chroot make -C $(PKG)/$@ chroot make unmount -inetutils: unamemod prep-chroot +inetutils: prep-chroot make -C $(PKG)/$@ chroot make unmount -iproute2: unamemod prep-chroot +iproute2: prep-chroot make -C $(PKG)/$@ chroot make unmount -perl: unamemod prep-chroot +perl: prep-chroot make -C $(PKG)/$@ chroot make unmount -texinfo: unamemod prep-chroot +texinfo: prep-chroot make -C $(PKG)/$@ chroot make unmount -autoconf: unamemod prep-chroot +autoconf: prep-chroot make -C $(PKG)/$@ chroot make unmount -automake: unamemod prep-chroot +automake: prep-chroot make -C $(PKG)/$@ chroot make unmount -bash: unamemod prep-chroot +bash: prep-chroot make -C $(PKG)/$@ chroot make unmount -file: unamemod prep-chroot +file: prep-chroot make -C $(PKG)/$@ chroot make unmount -libtool: unamemod prep-chroot +libtool: prep-chroot make -C $(PKG)/$@ chroot make unmount -bzip2: unamemod prep-chroot +bzip2: prep-chroot make -C $(PKG)/$@ chroot make unmount -diffutils: unamemod prep-chroot +diffutils: prep-chroot make -C $(PKG)/$@ chroot make unmount -kbd: unamemod prep-chroot +kbd: prep-chroot make -C $(PKG)/$@ chroot make unmount -e2fsprogs: unamemod prep-chroot +e2fsprogs: prep-chroot make -C $(PKG)/$@ chroot make unmount -grep: unamemod prep-chroot +grep: prep-chroot make -C $(PKG)/$@ chroot make unmount -grub: unamemod prep-chroot +grub: prep-chroot make -C $(PKG)/$@ chroot make unmount -gzip: unamemod prep-chroot +gzip: prep-chroot make -C $(PKG)/$@ chroot make unmount -hotplug: unamemod prep-chroot +hotplug: prep-chroot make -C $(PKG)/$@ chroot make unmount -man: unamemod prep-chroot +man: prep-chroot make -C $(PKG)/$@ chroot make unmount -make: unamemod prep-chroot +make: prep-chroot make -C $(PKG)/$@ chroot make unmount -module-init-tools: unamemod prep-chroot +module-init-tools: prep-chroot make -C $(PKG)/$@ chroot make unmount -patch: unamemod prep-chroot +patch: prep-chroot make -C $(PKG)/$@ chroot make unmount -procps: unamemod prep-chroot +procps: prep-chroot make -C $(PKG)/$@ chroot make unmount -psmisc: unamemod prep-chroot +psmisc: prep-chroot make -C $(PKG)/$@ chroot make unmount -shadow: unamemod prep-chroot +shadow: prep-chroot make -C $(PKG)/$@ chroot make unmount -libol: unamemod prep-chroot +libol: prep-chroot make -C $(PKG)/$@ chroot make unmount -syslog-ng: unamemod prep-chroot +syslog-ng: prep-chroot make -C $(PKG)/$@ chroot make unmount -sysvinit: unamemod prep-chroot +sysvinit: prep-chroot make -C $(PKG)/$@ chroot make unmount -tar: unamemod prep-chroot +tar: prep-chroot make -C $(PKG)/$@ chroot make unmount -udev: unamemod prep-chroot +udev: prep-chroot make -C $(PKG)/$@ chroot make unmount -util-linux: unamemod prep-chroot +util-linux: prep-chroot make -C $(PKG)/$@ chroot make unmount -lfs-bootscripts: unamemod prep-chroot +lfs-bootscripts: prep-chroot make -C $(PKG)/$@ chroot make unmount -wget: unamemod prep-chroot +wget: prep-chroot make -C $(PKG)/$@ chroot make unmount -reiserfsprogs: unamemod prep-chroot +reiserfsprogs: prep-chroot make -C $(PKG)/$@ chroot make unmount -xfsprogs: unamemod prep-chroot +xfsprogs: prep-chroot make -C $(PKG)/$@ chroot make unmount -slang: unamemod prep-chroot +slang: prep-chroot make -C $(PKG)/$@ chroot make unmount -nano: unamemod prep-chroot +nano: prep-chroot make -C $(PKG)/$@ chroot make unmount -joe: unamemod prep-chroot +joe: prep-chroot make -C $(PKG)/$@ chroot make unmount -screen: unamemod prep-chroot +screen: prep-chroot make -C $(PKG)/$@ chroot make unmount -openssl: unamemod prep-chroot +openssl: prep-chroot make -C $(PKG)/$@ chroot make unmount -curl: unamemod prep-chroot +curl: prep-chroot make -C $(PKG)/$@ chroot make unmount -gpm: unamemod prep-chroot +gpm: prep-chroot make -C $(PKG)/$@ chroot make unmount -zip: unamemod prep-chroot +zip: prep-chroot make -C $(PKG)/$@ chroot make unmount -unzip: unamemod prep-chroot +unzip: prep-chroot make -C $(PKG)/$@ chroot make unmount -lynx: unamemod prep-chroot +lynx: prep-chroot make -C $(PKG)/$@ chroot make unmount -libxml2: unamemod prep-chroot +libxml2: prep-chroot make -C $(PKG)/$@ chroot make unmount -expat: unamemod prep-chroot +expat: prep-chroot make -C $(PKG)/$@ chroot make unmount -subversion: unamemod prep-chroot +subversion: prep-chroot make -C $(PKG)/$@ chroot make unmount -docbook-xml: unamemod prep-chroot +docbook-xml: prep-chroot make -C $(PKG)/$@ chroot make unmount -libxslt: unamemod prep-chroot +libxslt: prep-chroot make -C $(PKG)/$@ chroot make unmount -docbook-xsl: unamemod prep-chroot +docbook-xsl: prep-chroot make -C $(PKG)/$@ chroot make unmount -html_tidy: unamemod prep-chroot +html_tidy: prep-chroot make -C $(PKG)/$@ chroot make unmount -LFS-BOOK: unamemod prep-chroot +LFS-BOOK: prep-chroot make -C $(PKG)/$@ chroot make unmount -libpng: unamemod prep-chroot +libpng: prep-chroot make -C $(PKG)/$@ chroot make unmount -freetype: unamemod prep-chroot +freetype: prep-chroot make -C $(PKG)/$@ chroot make unmount -fontconfig: unamemod prep-chroot +fontconfig: prep-chroot make -C $(PKG)/$@ chroot make unmount -Xorg: unamemod prep-chroot +Xorg: prep-chroot make -C $(PKG)/$@ chroot make unmount -libjpeg: unamemod prep-chroot +libjpeg: prep-chroot make -C $(PKG)/$@ chroot make unmount -libtiff: unamemod prep-chroot +libtiff: prep-chroot make -C $(PKG)/$@ chroot make unmount -links: unamemod prep-chroot +links: prep-chroot make -C $(PKG)/$@ chroot make unmount -openssh: unamemod prep-chroot +openssh: prep-chroot make -C $(PKG)/$@ chroot make unmount -pkgconfig: unamemod prep-chroot +pkgconfig: prep-chroot make -C $(PKG)/$@ chroot make unmount -glib2: unamemod prep-chroot +glib2: prep-chroot make -C $(PKG)/$@ chroot make unmount -libungif: unamemod prep-chroot +libungif: prep-chroot make -C $(PKG)/$@ chroot make unmount -imlib2: unamemod prep-chroot +imlib2: prep-chroot make -C $(PKG)/$@ chroot make unmount -pango: unamemod prep-chroot +pango: prep-chroot make -C $(PKG)/$@ chroot make unmount -atk: unamemod prep-chroot +atk: prep-chroot make -C $(PKG)/$@ chroot make unmount -gtk2: unamemod prep-chroot +gtk2: prep-chroot make -C $(PKG)/gtk+2 chroot make unmount -libIDL: unamemod prep-chroot +libIDL: prep-chroot make -C $(PKG)/$@ chroot make unmount -firefox: unamemod prep-chroot +firefox: prep-chroot make -C $(PKG)/$@ chroot make unmount -fluxbox: unamemod prep-chroot +fluxbox: prep-chroot make -C $(PKG)/$@ chroot make unmount -libast: unamemod prep-chroot +libast: prep-chroot make -C $(PKG)/$@ chroot make unmount -Eterm: unamemod prep-chroot +Eterm: prep-chroot make -C $(PKG)/$@ chroot make unmount -irssi: unamemod prep-chroot +irssi: prep-chroot make -C $(PKG)/$@ chroot make unmount -xchat: unamemod prep-chroot +xchat: prep-chroot make -C $(PKG)/$@ chroot make unmount -samba: unamemod prep-chroot +samba: prep-chroot make -C $(PKG)/$@ chroot make unmount -tcpwrappers: unamemod prep-chroot +tcpwrappers: prep-chroot make -C $(PKG)/$@ chroot make unmount -portmap: unamemod prep-chroot +portmap: prep-chroot make -C $(PKG)/$@ chroot make unmount -nfs-utils: unamemod prep-chroot +nfs-utils: prep-chroot make -C $(PKG)/$@ chroot make unmount -traceroute: unamemod prep-chroot +traceroute: prep-chroot make -C $(PKG)/$@ chroot make unmount -nALFS: unamemod prep-chroot +nALFS: prep-chroot make -C $(PKG)/$@ chroot make unmount -device-mapper: unamemod prep-chroot +device-mapper: prep-chroot make -C $(PKG)/$@ chroot make unmount -LVM2: unamemod prep-chroot +LVM2: prep-chroot make -C $(PKG)/$@ chroot make unmount -dhcpcd: unamemod prep-chroot +dhcpcd: prep-chroot make -C $(PKG)/$@ chroot make unmount -libaal: unamemod prep-chroot +libaal: prep-chroot make -C $(PKG)/$@ chroot make unmount -reiser4progs: unamemod prep-chroot +reiser4progs: prep-chroot make -C $(PKG)/$@ chroot make unmount -squashfs: unamemod prep-chroot +squashfs: prep-chroot make -C $(PKG)/$@ chroot make unmount -cpio: unamemod prep-chroot +cpio: prep-chroot make -C $(PKG)/$@ chroot make unmount -db: unamemod prep-chroot +db: prep-chroot make -C $(PKG)/$@ chroot make unmount -postfix: unamemod prep-chroot +postfix: prep-chroot make -C $(PKG)/$@ chroot make unmount -mutt: unamemod prep-chroot +mutt: prep-chroot make -C $(PKG)/$@ chroot make unmount -slrn: unamemod prep-chroot +slrn: prep-chroot make -C $(PKG)/$@ chroot make unmount -linux: unamemod prep-chroot +linux: prep-chroot make -C $(PKG)/$@ chroot make unmount -cdrtools: unamemod prep-chroot +cdrtools: prep-chroot make -C $(PKG)/$@ chroot make unmount -blfs-bootscripts: unamemod prep-chroot +blfs-bootscripts: prep-chroot make -C $(PKG)/$@ chroot make unmount -syslinux: unamemod prep-chroot +yaboot: prep-chroot make -C $(PKG)/$@ chroot make unmount +parted: prep-chroot + make -C $(PKG)/$@ chroot + make unmount + strip: prep-chroot @chroot $(MP) $(chenvstrip) 'cd $(ROOT) && make ch-strip' make unmount @@ -1289,9 +1278,12 @@ ch-blfs-bootscripts: popdev make -C $(PKG)/blfs-bootscripts stage2 -ch-syslinux: popdev - make -C $(PKG)/syslinux stage2 +ch-yaboot: popdev + make -C $(PKG)/yaboot stage2 +ch-parted: popdev + make -C $(PKG)/parted stage2 + ch-strip: popdev @$(WD)/bin/find /{,usr/}{bin,lib,sbin} -type f -exec $(WD)/bin/strip --strip-debug '{}' ';' @@ -1315,15 +1307,14 @@ @touch prepiso iso: prepiso - cd $(MP)/iso ; $(WD)/bin/mkisofs -R -l -L -D -o $(MKTREE)/livecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \ - -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -V "LFS_CD" ./ + cd $(MP)/iso ; $(WD)/bin/mkisofs -D -hfs -part -map $(MKTREE)/packages/yaboot/maps -no-desktop -hfs-volid "LFSPPCCD" -hfs-bless boot -R -o $(MKTREE)/livecd-$(VERSION).iso ./ # Rules to clean your tree. # "clean" removes package directories and # "scrub" also removes all sources and the uname modules - basically # returning the tree to the condition it was in when it was unpacked -clean: unloadmodule unmount +clean: unmount @-rm -rf $(WD) $(MP)$(WD) @-userdel lfs @-groupdel lfs @@ -1342,9 +1333,6 @@ @-for i in `ls $(PKG)` ; do rm -rf $(PKG)/$$i/{*.gz,*.bz2,*.zip,*.tgz} ; done @-rm livecd-$(VERSION).iso -unloadmodule: - @-rmmod uname_i486 - unmount: @-umount $(MP)/dev/shm @-umount $(MP)/dev/pts @@ -1352,8 +1340,8 @@ @-umount $(MP)/proc @-umount $(MP)/sys -.PHONY: lfs-base pre-which pre-wget tools prep-chroot chroot createdirs createfiles popdev unamemod \ - clean scrub unloadmodule unmount lfs-wget lfs-rm-wget lfs-binutils-pass1 lfs-gcc-pass1 \ +.PHONY: lfs-base pre-which pre-wget tools prep-chroot chroot createdirs createfiles popdev \ + clean scrub unmount lfs-wget lfs-rm-wget lfs-binutils-pass1 lfs-gcc-pass1 \ lfs-linux-libc-headers lfs-glibc lfs-adjust-toolchain lfs-tcl lfs-expect lfs-dejagnu lfs-gcc-pass2 \ lfs-binutils-pass2 lfs-gawk lfs-coreutils lfs-bzip2 lfs-gzip lfs-diffutils lfs-findutils lfs-make \ lfs-grep lfs-gettext lfs-ncurses lfs-patch lfs-tar lfs-texinfo lfs-bash lfs-m4 lfs-bison lfs-flex \ Modified: branches/ppc/linux/config =================================================================== --- branches/ppc/linux/config 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/linux/config 2005-02-21 15:17:11 UTC (rev 71) @@ -1,13 +1,15 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.10 -# Wed Jan 26 12:22:38 2005 +# Sat Feb 19 23:35:18 2005 # -CONFIG_X86=y CONFIG_MMU=y -CONFIG_UID16=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_HAVE_DEC_LOCK=y +CONFIG_PPC=y +CONFIG_PPC32=y +CONFIG_GENERIC_NVRAM=y # # Code maturity level options @@ -28,7 +30,6 @@ # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y CONFIG_LOG_BUF_SHIFT=15 CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y @@ -60,145 +61,75 @@ CONFIG_STOP_MACHINE=y # -# Processor type and features +# Processor # -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=y -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# 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=y -CONFIG_X86_CMPXCHG=y -CONFIG_X86_XADD=y -CONFIG_X86_L1_CACHE_SHIFT=7 -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_F00F_BUG=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_ALIGNMENT_16=y -CONFIG_X86_INTEL_USERCOPY=y -# CONFIG_HPET_TIMER is not set +CONFIG_6xx=y +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_POWER3 is not set +# CONFIG_POWER4 is not set +# CONFIG_8xx is not set +# CONFIG_E500 is not set +CONFIG_ALTIVEC=y +# CONFIG_TAU is not set +# CONFIG_CPU_FREQ is not set +CONFIG_PPC601_SYNC_FIX=y +CONFIG_PM=y +CONFIG_PPC_STD_MMU=y + +# +# Platform options +# +CONFIG_PPC_MULTIPLATFORM=y +# CONFIG_APUS is not set +# CONFIG_WILLOW is not set +# CONFIG_PCORE is not set +# CONFIG_POWERPMC250 is not set +# CONFIG_EV64260 is not set +# CONFIG_SPRUCE is not set +# CONFIG_LOPEC is not set +# CONFIG_MCPN765 is not set +# CONFIG_MVME5100 is not set +# CONFIG_PPLUS is not set +# CONFIG_PRPMC750 is not set +# CONFIG_PRPMC800 is not set +# CONFIG_SANDPOINT is not set +# CONFIG_ADIR is not set +# CONFIG_K2 is not set +# CONFIG_PAL4 is not set +# CONFIG_GEMINI is not set +# CONFIG_EST8260 is not set +# CONFIG_SBC82xx is not set +# CONFIG_SBS8260 is not set +# CONFIG_RPX8260 is not set +# CONFIG_TQM8260 is not set +# CONFIG_ADS8272 is not set +# CONFIG_LITE5200 is not set +CONFIG_PPC_CHRP=y +CONFIG_PPC_PMAC=y +CONFIG_PPC_PREP=y +CONFIG_PPC_OF=y +CONFIG_PPCBUG_NVRAM=y CONFIG_SMP=y +# CONFIG_IRQ_ALL_CPUS is not set CONFIG_NR_CPUS=8 -CONFIG_SCHED_SMT=y CONFIG_PREEMPT=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -CONFIG_X86_MCE=y -CONFIG_X86_MCE_NONFATAL=y -CONFIG_X86_MCE_P4THERMAL=y -CONFIG_TOSHIBA=m -CONFIG_I8K=m -# 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 is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set CONFIG_HIGHMEM=y -# CONFIG_HIGHPTE is not set -# CONFIG_MATH_EMULATION is not set -CONFIG_MTRR=y -# CONFIG_EFI is not set -CONFIG_IRQBALANCE=y -CONFIG_HAVE_DEC_LOCK=y -# CONFIG_REGPARM is not set +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_MISC=y +CONFIG_PROC_DEVICETREE=y +# CONFIG_PREP_RESIDUAL is not set +# CONFIG_CMDLINE_BOOL is not set # -# Power management options (ACPI, APM) +# Bus options # -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set -CONFIG_SOFTWARE_SUSPEND=y -CONFIG_PM_STD_PARTITION="" - -# -# ACPI (Advanced Configuration and Power Interface) Support -# -CONFIG_ACPI=y -CONFIG_ACPI_BOOT=y -CONFIG_ACPI_INTERPRETER=y -CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_SLEEP_PROC_FS=y -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_THERMAL=m -CONFIG_ACPI_ASUS=m -CONFIG_ACPI_IBM=m -CONFIG_ACPI_TOSHIBA=m -CONFIG_ACPI_BLACKLIST_YEAR=0 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_BUS=y -CONFIG_ACPI_EC=y -CONFIG_ACPI_POWER=y -CONFIG_ACPI_PCI=y -CONFIG_ACPI_SYSTEM=y -# CONFIG_X86_PM_TIMER is not set - -# -# APM (Advanced Power Management) BIOS Support -# -# CONFIG_APM is not set - -# -# CPU Frequency scaling -# -# CONFIG_CPU_FREQ is not set - -# -# Bus options (PCI, PCMCIA, EISA, MCA, ISA) -# +CONFIG_ISA=y +CONFIG_GENERIC_ISA_DMA=y 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_MMCONFIG=y -# CONFIG_PCI_MSI is not set +CONFIG_PCI_DOMAINS=y CONFIG_PCI_LEGACY_PROC=y CONFIG_PCI_NAMES=y -CONFIG_ISA=y -# CONFIG_EISA is not set -# CONFIG_MCA is not set -# CONFIG_SCx200 is not set # # PCCARD (PCMCIA/CardBus) support @@ -220,16 +151,18 @@ CONFIG_PCMCIA_PROBE=y # -# PCI Hotplug Support +# Advanced setup # -# CONFIG_HOTPLUG_PCI is not set +# CONFIG_ADVANCED_OPTIONS is not set # -# Executable file formats +# Default settings for advanced configuration options are used # -CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_AOUT=y -CONFIG_BINFMT_MISC=y +CONFIG_HIGHMEM_START=0xfe000000 +CONFIG_LOWMEM_SIZE=0x30000000 +CONFIG_KERNEL_START=0xc0000000 +CONFIG_TASK_SIZE=0x80000000 +CONFIG_BOOT_LOAD=0x00800000 # # Device Drivers @@ -270,13 +203,12 @@ # Protocols # CONFIG_ISAPNP=y -# CONFIG_PNPBIOS is not set -CONFIG_PNPACPI=y # # Block devices # CONFIG_BLK_DEV_FD=y +# CONFIG_MAC_FLOPPY is not set # CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set CONFIG_BLK_CPQ_DA=m @@ -289,8 +221,9 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 CONFIG_INITRAMFS_SOURCE="" CONFIG_LBD=y # CONFIG_CDROM_PKTCDVD is not set @@ -313,7 +246,6 @@ # 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=y CONFIG_IDEDISK_MULTI_MODE=y CONFIG_BLK_DEV_IDECS=m @@ -327,15 +259,13 @@ # IDE chipset support/bugfixes # 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=y # CONFIG_BLK_DEV_OPTI621 is not set -CONFIG_BLK_DEV_RZ1000=y +# CONFIG_BLK_DEV_SL82C105 is not set CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y @@ -344,7 +274,6 @@ CONFIG_BLK_DEV_ALI15X3=m # CONFIG_WDC_ALI15X3 is not set CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m CONFIG_BLK_DEV_CMD64X=m CONFIG_BLK_DEV_TRIFLEX=m CONFIG_BLK_DEV_CY82C693=m @@ -362,10 +291,13 @@ CONFIG_PDC202XX_FORCE=y CONFIG_BLK_DEV_SVWKS=m CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m CONFIG_BLK_DEV_SLC90E66=m CONFIG_BLK_DEV_TRM290=m CONFIG_BLK_DEV_VIA82CXXX=m +CONFIG_BLK_DEV_IDE_PMAC=y +CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y +CONFIG_BLK_DEV_IDEDMA_PMAC=y +# CONFIG_BLK_DEV_IDE_PMAC_BLINK is not set # CONFIG_IDE_ARM is not set # CONFIG_IDE_CHIPSETS is not set CONFIG_BLK_DEV_IDEDMA=y @@ -407,10 +339,10 @@ # CONFIG_BLK_DEV_3W_XXXX_RAID=y CONFIG_SCSI_3W_9XXX=y -CONFIG_SCSI_7000FASST=y +# CONFIG_SCSI_7000FASST is not set CONFIG_SCSI_ACARD=y CONFIG_SCSI_AHA152X=y -CONFIG_SCSI_AHA1542=y +# CONFIG_SCSI_AHA1542 is not set CONFIG_SCSI_AACRAID=y CONFIG_SCSI_AIC7XXX=y CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 @@ -428,7 +360,7 @@ CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_SCSI_DPT_I2O=y CONFIG_SCSI_ADVANSYS=y -CONFIG_SCSI_IN2000=y +# CONFIG_SCSI_IN2000 is not set CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=y CONFIG_MEGARAID_MAILBOX=y @@ -491,7 +423,6 @@ CONFIG_SCSI_QLA2322=y CONFIG_SCSI_QLA6312=y CONFIG_SCSI_QLA6322=y -CONFIG_SCSI_SEAGATE=y CONFIG_SCSI_SYM53C416=y CONFIG_SCSI_DC395x=y CONFIG_SCSI_DC390T=y @@ -500,9 +431,12 @@ # CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set # CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set CONFIG_SCSI_U14_34F_MAX_TAGS=8 -CONFIG_SCSI_ULTRASTOR=y CONFIG_SCSI_NSP32=y # CONFIG_SCSI_DEBUG is not set +CONFIG_SCSI_MESH=y +CONFIG_SCSI_MESH_SYNC_RATE=5 +CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 +# CONFIG_SCSI_MAC53C94 is not set # # PCMCIA SCSI adapter support @@ -565,11 +499,13 @@ # Protocol Drivers # # CONFIG_IEEE1394_VIDEO1394 is not set -# CONFIG_IEEE1394_SBP2 is not set +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set CONFIG_IEEE1394_ETH1394=m -# CONFIG_IEEE1394_DV1394 is not set +CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m -# CONFIG_IEEE1394_CMP is not set +CONFIG_IEEE1394_CMP=m +# CONFIG_IEEE1394_AMDTP is not set # # I2O device support @@ -577,6 +513,21 @@ # CONFIG_I2O is not set # +# Macintosh device drivers +# +CONFIG_ADB=y +CONFIG_ADB_CUDA=y +CONFIG_ADB_PMU=y +CONFIG_PMAC_PBOOK=y +CONFIG_PMAC_APM_EMU=m +CONFIG_PMAC_BACKLIGHT=y +# CONFIG_MAC_SERIAL is not set +CONFIG_ADB_MACIO=y +CONFIG_INPUT_ADBHID=y +CONFIG_MAC_EMUMOUSEBTN=y +CONFIG_ANSLCD=m + +# # Networking support # CONFIG_NET=y @@ -723,6 +674,10 @@ # CONFIG_NET_ETHERNET=y CONFIG_MII=y +CONFIG_MACE=m +# CONFIG_MACE_AAUI_PORT is not set +CONFIG_BMAC=m +# CONFIG_OAKNET is not set CONFIG_HAPPYMEAL=m CONFIG_SUNGEM=m CONFIG_NET_VENDOR_3COM=y @@ -850,6 +805,7 @@ # CONFIG_AIRO=m CONFIG_HERMES=m +# CONFIG_APPLE_AIRPORT is not set CONFIG_PLX_HERMES=m CONFIG_TMD_HERMES=m CONFIG_PCI_HERMES=m @@ -977,7 +933,6 @@ CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_CONSOLE is not set # CONFIG_SERIAL_8250_CS is not set -# CONFIG_SERIAL_8250_ACPI is not set CONFIG_SERIAL_8250_NR_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set @@ -985,6 +940,7 @@ # Non-8250 serial port support # CONFIG_SERIAL_CORE=y +# CONFIG_SERIAL_PMACZILOG is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 @@ -1002,39 +958,22 @@ # Watchdog Cards # # CONFIG_WATCHDOG is not set -CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set -# CONFIG_RTC is not set # CONFIG_GEN_RTC is not set # 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=y -CONFIG_AGP_ALI=m -CONFIG_AGP_ATI=m -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 -CONFIG_AGP_VIA=m -CONFIG_AGP_EFFICEON=m +CONFIG_AGP_UNINORTH=m CONFIG_DRM=y CONFIG_DRM_TDFX=m # CONFIG_DRM_GAMMA is not set CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m -CONFIG_DRM_I915=m CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m @@ -1042,21 +981,18 @@ # PCMCIA character devices # # CONFIG_SYNCLINK_CS is not set -# CONFIG_MWAVE is not set # CONFIG_RAW_DRIVER is not set -# CONFIG_HPET is not set -# CONFIG_HANGCHECK_TIMER is not set # # I2C support # -CONFIG_I2C=m +CONFIG_I2C=y # CONFIG_I2C_CHARDEV is not set # # I2C Algorithms # -CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOBIT=y # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALGOPCA is not set @@ -1069,9 +1005,11 @@ # CONFIG_I2C_AMD756 is not set # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_ELEKTOR is not set +# CONFIG_I2C_HYDRA is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set # CONFIG_I2C_ISA is not set +# CONFIG_I2C_KEYWEST is not set # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set @@ -1138,7 +1076,6 @@ # # Misc devices # -# CONFIG_IBM_ASM is not set # # Multimedia devices @@ -1159,21 +1096,27 @@ # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ASILIANT is not set +CONFIG_FB_OF=y +CONFIG_FB_CONTROL=y +CONFIG_FB_PLATINUM=y +CONFIG_FB_VALKYRIE=y +CONFIG_FB_CT65550=y +CONFIG_FB_ASILIANT=y # CONFIG_FB_IMSTT is not set +# CONFIG_FB_S3TRIO is not set # CONFIG_FB_VGA16 is not set -CONFIG_FB_VESA=y -CONFIG_VIDEO_SELECT=y -# CONFIG_FB_HGA is not set # CONFIG_FB_RIVA is not set -CONFIG_FB_I810=y -# CONFIG_FB_I810_GTF 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_RADEON=y +CONFIG_FB_RADEON_I2C=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=y +CONFIG_FB_ATY=y +CONFIG_FB_ATY_CT=y +# CONFIG_FB_ATY_GENERIC_LCD is not set +# CONFIG_FB_ATY_XL_INIT is not set +CONFIG_FB_ATY_GX=y # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set # CONFIG_FB_NEOMAGIC is not set @@ -1206,9 +1149,123 @@ # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=m +# CONFIG_DMASOUND_PMAC is not set # +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ISA devices +# +# CONFIG_SND_AD1816A is not set +# CONFIG_SND_AD1848 is not set +# CONFIG_SND_CS4231 is not set +# CONFIG_SND_CS4232 is not set +# CONFIG_SND_CS4236 is not set +# CONFIG_SND_ES968 is not set +# CONFIG_SND_ES1688 is not set +# CONFIG_SND_ES18XX is not set +# CONFIG_SND_GUSCLASSIC is not set +# CONFIG_SND_GUSEXTREME is not set +# CONFIG_SND_GUSMAX is not set +# CONFIG_SND_INTERWAVE is not set +# CONFIG_SND_INTERWAVE_STB is not set +# CONFIG_SND_OPTI92X_AD1848 is not set +# CONFIG_SND_OPTI92X_CS4231 is not set +# CONFIG_SND_OPTI93X is not set +# CONFIG_SND_SB8 is not set +# CONFIG_SND_SB16 is not set +# CONFIG_SND_SBAWE is not set +# CONFIG_SND_WAVEFRONT is not set +# CONFIG_SND_ALS100 is not set +# CONFIG_SND_AZT2320 is not set +# CONFIG_SND_CMI8330 is not set +# CONFIG_SND_DT019X is not set +# CONFIG_SND_OPL3SA2 is not set +# CONFIG_SND_SGALAXY is not set +# CONFIG_SND_SSCAPE is not set + +# +# PCI devices +# +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VX222 is not set + +# +# ALSA PowerMac devices +# +CONFIG_SND_POWERMAC=m + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_USX2Y is not set + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_VXP440 is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# # USB support # CONFIG_USB=y @@ -1238,7 +1295,9 @@ # # USB Device Class drivers # +# CONFIG_USB_AUDIO is not set # CONFIG_USB_BLUETOOTH_TTY is not set +# CONFIG_USB_MIDI is not set # CONFIG_USB_ACM is not set CONFIG_USB_PRINTER=y @@ -1413,8 +1472,8 @@ # # 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_HFS_FS=m +CONFIG_HFSPLUS_FS=m # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set @@ -1506,6 +1565,14 @@ # CONFIG_NLS_UTF8 is not set # +# Library routines +# +CONFIG_CRC_CCITT=m +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y + +# # Profiling support # CONFIG_PROFILING=y @@ -1515,11 +1582,7 @@ # Kernel hacking # # CONFIG_DEBUG_KERNEL is not set -# 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 +# CONFIG_BOOTX_TEXT is not set # # Security options @@ -1543,7 +1606,7 @@ # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_AES_586 is not set +# CONFIG_CRYPTO_AES is not set # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set @@ -1554,18 +1617,3 @@ # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_TEST is not set - -# -# Library routines -# -CONFIG_CRC_CCITT=m -CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_X86_SMP=y -CONFIG_X86_HT=y -CONFIG_X86_BIOS_REBOOT=y -CONFIG_X86_TRAMPOLINE=y -CONFIG_PC=y Modified: branches/ppc/packages/LVM2/Makefile =================================================================== --- branches/ppc/packages/LVM2/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/LVM2/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -2,7 +2,7 @@ # Package versions NM= LVM2 -VRS= 2.01.04 +VRS= 2.01.05 DIR= $(NM).$(VRS) FILE= $(DIR).tgz URL= ftp://sources.redhat.com/pub/lvm2/$(FILE) Modified: branches/ppc/packages/binutils/Makefile =================================================================== --- branches/ppc/packages/binutils/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/binutils/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -26,7 +26,7 @@ @echo 'main(){}' > dummy.c && cc dummy.c && readelf -l a.out > .specstest @if ! cat .specstest | grep -q $(WD) ; then cd $(NM)-build && \ make -C ld install && SPECFILE=`gcc --print-file specs` && \ - sed 's@ /lib/ld-linux.so.2@ $(WD)/lib/[EMAIL PROTECTED]' $$SPECFILE > tempspecfile && \ + sed 's@ /lib/ld.so.1@ $(WD)/lib/[EMAIL PROTECTED]' $$SPECFILE > tempspecfile && \ mv -f tempspecfile $$SPECFILE && unset SPECFILE && \ rm -f $(WD)/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h} && cd .. && make clean ; fi @touch adjust-toolchain @@ -49,7 +49,7 @@ re-adjust-toolchain: @echo 'main(){}' > dummy.c && cc dummy.c && readelf -l a.out > .specstest @if cat .specstest | grep -q $(WD) ; then cd $(NM)-build && make -C ld INSTALL=$(WD)/bin/install install && \ - perl -pi -e 's@ $(WD)/lib/ld-linux.so.2@ /lib/[EMAIL PROTECTED];' -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/@g;' `gcc --print-file specs` ; fi + perl -pi -e 's@ $(WD)/lib/ld.so.1@ /lib/[EMAIL PROTECTED];' -e '[EMAIL PROTECTED]:[EMAIL PROTECTED]/usr/lib/@g;' `gcc --print-file specs` ; fi @touch re-adjust-toolchain @make clean Modified: branches/ppc/packages/coreutils/Makefile =================================================================== --- branches/ppc/packages/coreutils/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/coreutils/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -5,8 +5,7 @@ VRS= 5.2.1 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 -PATCH1= $(DIR)-uname-2.patch -PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch +PATCH1= $(DIR)-suppress_uptime_kill_su-1.patch URL= $(FTP)/$(NM)/$(FILE) URL1= $(FTP)/$(NM)/$(PATCH1) URL2= $(FTP)/$(NM)/$(PATCH2) @@ -36,10 +35,8 @@ mv $(FILE) $(SRC) ; fi @if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \ mv $(PATCH1) $(SRC) ; fi - @if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL2) && \ - mv $(PATCH2) $(SRC) ; fi @if [ ! -f /bin/ls ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ - patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i $(SRC)/$(PATCH2) && \ + patch -Np1 -i $(SRC)/$(PATCH1) && \ DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=/usr && \ make -j3 && make install && \ $(WD)/bin/mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin && \ Modified: branches/ppc/packages/dhcpcd/Makefile =================================================================== --- branches/ppc/packages/dhcpcd/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/dhcpcd/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -22,7 +22,7 @@ @echo "" @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi @if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi - @if [ ! -f /usr/sbin/dhcpcd ] ; then tar xzvf $(FILE) && cd $(DIR) && \ + @if [ ! -f /sbin/dhcpcd ] ; then tar xzvf $(FILE) && cd $(DIR) && \ patch -Np1 -i ../$(PATCH) && \ ./configure --prefix="" --sysconfdir=/var/lib --mandir=/usr/share/man && \ make -j3 && \ Modified: branches/ppc/packages/html_tidy/Makefile =================================================================== --- branches/ppc/packages/html_tidy/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/html_tidy/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -2,9 +2,8 @@ # Package versions NM= tidy -VRS= 050120 DIR= $(NM) -FILE= $(NM)_src_$(VRS).tgz +FILE= $(NM)_src.tgz FILE2= $(NM)_docs.tgz URL= http://tidy.sourceforge.net/src/$(FILE) URL2= http://tidy.sourceforge.net/docs/$(FILE2) Modified: branches/ppc/packages/linux/Makefile =================================================================== --- branches/ppc/packages/linux/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/linux/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -28,7 +28,7 @@ @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && mv $(FILE) $(SRC) ; fi @if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && mv $(PATCH1) $(SRC) ; fi @if [ ! -f $(PATCH2) ] ; then $(WGET) $(URL2) && gunzip $(FILE1) ; fi - @if [ ! -f /boot/isolinux/linux ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ + @if [ ! -f /boot/linux ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ patch -Np1 -i $(SRC)/$(PATCH1) && \ patch -Np1 -i ../$(PATCH2) && \ patch -Np1 -i $(ROOT)/$(PKG)/squashfs/squashfs2.1/linux-2.6.9/$(PATCH3) && \ @@ -42,8 +42,7 @@ cp initramfs_data.cpio.gz $(ROOT)/$(PKG)/$(NM)/$(DIR)/usr/ && \ cd $(ROOT)/$(PKG)/$(NM)/$(DIR) && \ make ; fi - @-mkdir /boot/isolinux - @-cp $(DIR)/arch/i386/boot/bzImage /boot/isolinux/linux + @-cp $(DIR)/vmlinux /boot/linux clean: @-rm -rf $(DIR) Modified: branches/ppc/packages/linux-libc-headers/Makefile =================================================================== --- branches/ppc/packages/linux-libc-headers/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/linux-libc-headers/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -18,7 +18,7 @@ @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \ mv $(FILE) $(SRC) ; fi @if [ ! -d $(WD)/include/asm ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ - cp -R include/asm-i386 $(WD)/include/asm && cp -R include/linux $(WD)/include ; fi + cp -R include/asm-ppc $(WD)/include/asm && cp -R include/linux $(WD)/include ; fi @make clean chroot: @@ -31,7 +31,7 @@ @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \ mv $(FILE) $(SRC) ; fi @if [ ! -d /usr/include/asm ] ; then tar xjvf $(SRC)/$(FILE) && \ - cd $(DIR) && cp -R include/asm-i386 /usr/include/asm && cp -R include/linux /usr/include && \ + cd $(DIR) && cp -R include/asm-ppc /usr/include/asm && cp -R include/linux /usr/include && \ chown -R root:root /usr/include/{asm,linux} && \ find /usr/include/{asm,linux} -type d -exec chmod 755 {} \; && \ find /usr/include/{asm,linux} -type f -exec chmod 644 {} \; ; fi Added: branches/ppc/packages/parted/Makefile =================================================================== --- branches/ppc/packages/parted/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/parted/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -0,0 +1,29 @@ +# parted Makefile + +# Package versions +NM= parted +VRS= 1.6.21 +DIR= $(NM)-$(VRS) +FILE= $(DIR).tar.gz +URL= http://ftp.gnu.org/gnu/parted/$(FILE) + +#RULES + +.PHONY: clean chroot stage2 + +chroot: + @chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)' + +stage2: + @echo "" + @echo "=====> Building $(NM) in chroot" + @echo "" + @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi + @if [ ! -f /usr/bin/parted ] ; then tar xzvf $(FILE) && cd $(DIR) && \ + ./configure --prefix=/usr && \ + make -j3 && \ + make install ; fi + @make clean + +clean: + @-rm -rf $(DIR) Modified: branches/ppc/packages/shadow/Makefile =================================================================== --- branches/ppc/packages/shadow/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/shadow/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -5,7 +5,7 @@ VRS= 4.0.7 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 -URL= ftp://ftp.pld.org.pl/software/$(NM)/$(FILE) +URL= $(FTP)/$(NM)/$(FILE) # RULES Modified: branches/ppc/packages/unzip/Makefile =================================================================== --- branches/ppc/packages/unzip/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/unzip/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -35,10 +35,8 @@ patch -Np1 -i ../$(PATCH2) && \ patch -Np1 -i ../$(PATCH3) && \ cp unix/Makefile . && \ - make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux && \ - make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_shlibz && \ - make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK install && \ - cp -d libunzip.so* /usr/lib ; fi + make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_noasm && \ + make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK install ; fi @make clean clean: Added: branches/ppc/packages/yaboot/Makefile =================================================================== --- branches/ppc/packages/yaboot/Makefile 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/yaboot/Makefile 2005-02-21 15:17:11 UTC (rev 71) @@ -0,0 +1,34 @@ +# Yaboot Makefile + +# Package versions +NM= yaboot +VRS= 1.3.13 +DIR= $(NM)-$(VRS) +FILE= $(DIR).tar.gz +URL= http://penguinppc.org/bootloaders/yaboot/$(FILE) +PATCH=$(DIR)-fix1.patch + +#RULES + +.PHONY: clean chroot stage2 + +chroot: + @chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)' + +stage2: + @echo "" + @echo "=====> Building $(NM) in chroot" + @echo "" + @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi + @if [ ! -f /usr/sbin/yabootconfig ] ; then tar xzvf $(FILE) && cd $(DIR) && \ + patch -Np1 -i ../$(PATCH) && \ + make PREFIX=usr && \ + make PREFIX=usr install && \ + cat doc/examples/simpleboot.chrp | sed -e 's/hd:2/cd:/' > /boot/ofboot.b && \ + cp /usr/lib/yaboot/yaboot /boot/ && \ + echo "device=cd:" > /boot/yaboot.conf && \ + echo "image=/boot/linux" >> /boot/yaboot.conf ; fi + @make clean + +clean: + @-rm -rf $(DIR) Added: branches/ppc/packages/yaboot/maps =================================================================== --- branches/ppc/packages/yaboot/maps 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/yaboot/maps 2005-02-21 15:17:11 UTC (rev 71) @@ -0,0 +1,8 @@ +# EXTN XLate Creator Type Comment +.b Raw 'UNIX' 'tbxi' "bootstrap" +yaboot Raw 'UNIX' 'boot' "bootstrap" +linux Raw 'UNIX' 'boot' "kernel" +vmlinux Raw 'UNIX' 'boot' "kernel" +.conf Raw 'UNIX' 'conf' "bootstrap" +root.bin Raw 'UNIX' 'root' "root_image" +* Raw 'UNIX' 'UNIX' "unix" Added: branches/ppc/packages/yaboot/yaboot-1.3.13-fix1.patch =================================================================== --- branches/ppc/packages/yaboot/yaboot-1.3.13-fix1.patch 2005-02-18 13:42:23 UTC (rev 70) +++ branches/ppc/packages/yaboot/yaboot-1.3.13-fix1.patch 2005-02-21 15:17:11 UTC (rev 71) @@ -0,0 +1,14 @@ +diff -Naur yaboot-1.3.13.orig/lib/strstr.c yaboot-1.3.13/lib/strstr.c +--- yaboot-1.3.13.orig/lib/strstr.c 2001-09-20 09:15:31.000000000 -0400 ++++ yaboot-1.3.13/lib/strstr.c 2005-02-20 22:03:10.215796824 -0500 +@@ -76,7 +76,9 @@ + a = *++haystack; + if (a == '\0') + goto ret0; +-shloop: } ++shloop: ++ a = a; ++ } + while (a != b); + + jin: a = *++haystack; -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
