From c3db995cc9ed54c7085810e08c3314cfe705e02d Mon Sep 17 00:00:00 2001 From: ms Date: Fri, 20 Oct 2006 14:32:17 +0000 Subject: [PATCH] Zwischencommit fuer LFS. Ein Paar Rootfiles erstellt. ./make.sh prefetch nach ./make.sh downloadsrc umbenannt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@326 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/autoconf | 61 ++++++++++++ config/rootfiles/common/automake | 121 +++++++++++++++++++++++ config/rootfiles/common/bind | 6 ++ config/rootfiles/common/binutils | 79 +++++++++++++++ config/rootfiles/common/bzip2 | 24 +++++ config/rootfiles/common/coreutils | 153 ++++++++++++++++++++++++++++++ config/rootfiles/common/gcc | 6 +- config/rootfiles/common/gzip | 27 ++++++ config/rootfiles/common/stage2 | 1 + lfs/stage2 | 2 +- lfs/zaptel | 4 +- make.sh | 14 +-- 12 files changed, 485 insertions(+), 13 deletions(-) create mode 100644 config/rootfiles/common/autoconf create mode 100644 config/rootfiles/common/automake create mode 100644 config/rootfiles/common/bind create mode 100644 config/rootfiles/common/binutils create mode 100644 config/rootfiles/common/bzip2 create mode 100644 config/rootfiles/common/coreutils create mode 100644 config/rootfiles/common/gzip diff --git a/config/rootfiles/common/autoconf b/config/rootfiles/common/autoconf new file mode 100644 index 0000000000..8124618cef --- /dev/null +++ b/config/rootfiles/common/autoconf @@ -0,0 +1,61 @@ +#usr/bin/autoconf +#usr/bin/autoheader +#usr/bin/autom4te +#usr/bin/autoreconf +#usr/bin/autoscan +#usr/bin/autoupdate +#usr/bin/ifnames +#usr/info/autoconf.info +#usr/man/man1/autoconf.1 +#usr/man/man1/autoheader.1 +#usr/man/man1/autom4te.1 +#usr/man/man1/autoreconf.1 +#usr/man/man1/autoscan.1 +#usr/man/man1/autoupdate.1 +#usr/man/man1/config.guess.1 +#usr/man/man1/config.sub.1 +#usr/man/man1/ifnames.1 +#usr/share/autoconf +#usr/share/autoconf/Autom4te +#usr/share/autoconf/Autom4te/C4che.pm +#usr/share/autoconf/Autom4te/ChannelDefs.pm +#usr/share/autoconf/Autom4te/Channels.pm +#usr/share/autoconf/Autom4te/Configure_ac.pm +#usr/share/autoconf/Autom4te/FileUtils.pm +#usr/share/autoconf/Autom4te/General.pm +#usr/share/autoconf/Autom4te/Request.pm +#usr/share/autoconf/Autom4te/Struct.pm +#usr/share/autoconf/Autom4te/XFile.pm +#usr/share/autoconf/INSTALL +#usr/share/autoconf/autoconf +#usr/share/autoconf/autoconf/autoconf.m4 +#usr/share/autoconf/autoconf/autoconf.m4f +#usr/share/autoconf/autoconf/autoheader.m4 +#usr/share/autoconf/autoconf/autoscan.m4 +#usr/share/autoconf/autoconf/autotest.m4 +#usr/share/autoconf/autoconf/autoupdate.m4 +#usr/share/autoconf/autoconf/c.m4 +#usr/share/autoconf/autoconf/fortran.m4 +#usr/share/autoconf/autoconf/functions.m4 +#usr/share/autoconf/autoconf/general.m4 +#usr/share/autoconf/autoconf/headers.m4 +#usr/share/autoconf/autoconf/lang.m4 +#usr/share/autoconf/autoconf/libs.m4 +#usr/share/autoconf/autoconf/oldnames.m4 +#usr/share/autoconf/autoconf/programs.m4 +#usr/share/autoconf/autoconf/specific.m4 +#usr/share/autoconf/autoconf/status.m4 +#usr/share/autoconf/autoconf/types.m4 +#usr/share/autoconf/autom4te.cfg +#usr/share/autoconf/autoscan +#usr/share/autoconf/autoscan/autoscan.list +#usr/share/autoconf/autotest +#usr/share/autoconf/autotest/autotest.m4 +#usr/share/autoconf/autotest/autotest.m4f +#usr/share/autoconf/autotest/general.m4 +#usr/share/autoconf/m4sugar +#usr/share/autoconf/m4sugar/m4sh.m4 +#usr/share/autoconf/m4sugar/m4sh.m4f +#usr/share/autoconf/m4sugar/m4sugar.m4 +#usr/share/autoconf/m4sugar/m4sugar.m4f +#usr/share/autoconf/m4sugar/version.m4 diff --git a/config/rootfiles/common/automake b/config/rootfiles/common/automake new file mode 100644 index 0000000000..2b2ceb2a75 --- /dev/null +++ b/config/rootfiles/common/automake @@ -0,0 +1,121 @@ +#usr/bin/aclocal +#usr/bin/aclocal-1.9 +#usr/bin/automake +#usr/bin/automake-1.9 +#usr/share/aclocal-1.9 +#usr/share/aclocal-1.9/amversion.m4 +#usr/share/aclocal-1.9/as.m4 +#usr/share/aclocal-1.9/auxdir.m4 +#usr/share/aclocal-1.9/ccstdc.m4 +#usr/share/aclocal-1.9/cond.m4 +#usr/share/aclocal-1.9/depend.m4 +#usr/share/aclocal-1.9/depout.m4 +#usr/share/aclocal-1.9/dmalloc.m4 +#usr/share/aclocal-1.9/gcj.m4 +#usr/share/aclocal-1.9/header.m4 +#usr/share/aclocal-1.9/init.m4 +#usr/share/aclocal-1.9/install-sh.m4 +#usr/share/aclocal-1.9/lead-dot.m4 +#usr/share/aclocal-1.9/lex.m4 +#usr/share/aclocal-1.9/lispdir.m4 +#usr/share/aclocal-1.9/maintainer.m4 +#usr/share/aclocal-1.9/make.m4 +#usr/share/aclocal-1.9/minuso.m4 +#usr/share/aclocal-1.9/missing.m4 +#usr/share/aclocal-1.9/mkdirp.m4 +#usr/share/aclocal-1.9/multi.m4 +#usr/share/aclocal-1.9/obsol-gt.m4 +#usr/share/aclocal-1.9/obsol-lt.m4 +#usr/share/aclocal-1.9/obsolete.m4 +#usr/share/aclocal-1.9/options.m4 +#usr/share/aclocal-1.9/protos.m4 +#usr/share/aclocal-1.9/python.m4 +#usr/share/aclocal-1.9/regex.m4 +#usr/share/aclocal-1.9/runlog.m4 +#usr/share/aclocal-1.9/sanity.m4 +#usr/share/aclocal-1.9/strip.m4 +#usr/share/aclocal-1.9/tar.m4 +#usr/share/automake-1.9 +#usr/share/automake-1.9/Automake +#usr/share/automake-1.9/Automake/ChannelDefs.pm +#usr/share/automake-1.9/Automake/Channels.pm +#usr/share/automake-1.9/Automake/Condition.pm +#usr/share/automake-1.9/Automake/Config.pm +#usr/share/automake-1.9/Automake/Configure_ac.pm +#usr/share/automake-1.9/Automake/DisjConditions.pm +#usr/share/automake-1.9/Automake/FileUtils.pm +#usr/share/automake-1.9/Automake/General.pm +#usr/share/automake-1.9/Automake/Item.pm +#usr/share/automake-1.9/Automake/ItemDef.pm +#usr/share/automake-1.9/Automake/Location.pm +#usr/share/automake-1.9/Automake/Options.pm +#usr/share/automake-1.9/Automake/Rule.pm +#usr/share/automake-1.9/Automake/RuleDef.pm +#usr/share/automake-1.9/Automake/Struct.pm +#usr/share/automake-1.9/Automake/VarDef.pm +#usr/share/automake-1.9/Automake/Variable.pm +#usr/share/automake-1.9/Automake/Version.pm +#usr/share/automake-1.9/Automake/Wrap.pm +#usr/share/automake-1.9/Automake/XFile.pm +#usr/share/automake-1.9/COPYING +#usr/share/automake-1.9/INSTALL +#usr/share/automake-1.9/acinstall +#usr/share/automake-1.9/am +#usr/share/automake-1.9/am/ansi2knr.am +#usr/share/automake-1.9/am/check.am +#usr/share/automake-1.9/am/clean-hdr.am +#usr/share/automake-1.9/am/clean.am +#usr/share/automake-1.9/am/compile.am +#usr/share/automake-1.9/am/configure.am +#usr/share/automake-1.9/am/data.am +#usr/share/automake-1.9/am/dejagnu.am +#usr/share/automake-1.9/am/depend.am +#usr/share/automake-1.9/am/depend2.am +#usr/share/automake-1.9/am/distdir.am +#usr/share/automake-1.9/am/footer.am +#usr/share/automake-1.9/am/header-vars.am +#usr/share/automake-1.9/am/header.am +#usr/share/automake-1.9/am/inst-vars.am +#usr/share/automake-1.9/am/install.am +#usr/share/automake-1.9/am/java.am +#usr/share/automake-1.9/am/lang-compile.am +#usr/share/automake-1.9/am/lex.am +#usr/share/automake-1.9/am/library.am +#usr/share/automake-1.9/am/libs.am +#usr/share/automake-1.9/am/libtool.am +#usr/share/automake-1.9/am/lisp.am +#usr/share/automake-1.9/am/ltlib.am +#usr/share/automake-1.9/am/ltlibrary.am +#usr/share/automake-1.9/am/mans-vars.am +#usr/share/automake-1.9/am/mans.am +#usr/share/automake-1.9/am/multilib.am +#usr/share/automake-1.9/am/program.am +#usr/share/automake-1.9/am/progs.am +#usr/share/automake-1.9/am/python.am +#usr/share/automake-1.9/am/remake-hdr.am +#usr/share/automake-1.9/am/scripts.am +#usr/share/automake-1.9/am/subdirs.am +#usr/share/automake-1.9/am/tags.am +#usr/share/automake-1.9/am/texi-vers.am +#usr/share/automake-1.9/am/texibuild.am +#usr/share/automake-1.9/am/texinfos.am +#usr/share/automake-1.9/am/yacc.am +#usr/share/automake-1.9/ansi2knr.1 +#usr/share/automake-1.9/ansi2knr.c +#usr/share/automake-1.9/compile +#usr/share/automake-1.9/config-ml.in +#usr/share/automake-1.9/config.guess +#usr/share/automake-1.9/config.sub +#usr/share/automake-1.9/depcomp +#usr/share/automake-1.9/elisp-comp +#usr/share/automake-1.9/install-sh +#usr/share/automake-1.9/mdate-sh +#usr/share/automake-1.9/missing +#usr/share/automake-1.9/mkinstalldirs +#usr/share/automake-1.9/py-compile +#usr/share/automake-1.9/symlink-tree +#usr/share/automake-1.9/texinfo.tex +#usr/share/automake-1.9/ylwrap +#usr/share/info/automake.info +#usr/share/info/automake.info-1 +#usr/share/info/automake.info-2 diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind new file mode 100644 index 0000000000..ead4bfa1c0 --- /dev/null +++ b/config/rootfiles/common/bind @@ -0,0 +1,6 @@ +#usr/bin/dig +#usr/bin/host +#usr/bin/nslookup +#usr/man/man1/dig.1 +#usr/man/man1/host.1 +#usr/man/man1/nslookup.1 diff --git a/config/rootfiles/common/binutils b/config/rootfiles/common/binutils new file mode 100644 index 0000000000..771eb168b5 --- /dev/null +++ b/config/rootfiles/common/binutils @@ -0,0 +1,79 @@ +usr/bin/addr2line +usr/bin/ar +usr/bin/as +#usr/bin/c++filt +usr/bin/gprof +usr/bin/ld +usr/bin/nm +#usr/bin/objcopy +#usr/bin/objdump +#usr/bin/ranlib +#usr/bin/readelf +#usr/bin/size +#usr/bin/strings +#usr/bin/strip +#usr/include/ansidecl.h +#usr/include/bfd.h +#usr/include/bfdlink.h +#usr/include/dis-asm.h +#usr/include/libiberty.h +#usr/include/symcat.h +#usr/info/as.info +#usr/info/as.info-1 +#usr/info/as.info-2 +#usr/info/as.info-3 +#usr/info/bfd.info +#usr/info/bfd.info-1 +#usr/info/bfd.info-2 +#usr/info/binutils.info +#usr/info/configure.info +#usr/info/gprof.info +#usr/info/ld.info +#usr/info/standards.info +#usr/lib/ldscripts +#usr/lib/ldscripts/elf_i386.x +#usr/lib/ldscripts/elf_i386.xbn +#usr/lib/ldscripts/elf_i386.xc +#usr/lib/ldscripts/elf_i386.xd +#usr/lib/ldscripts/elf_i386.xdc +#usr/lib/ldscripts/elf_i386.xdw +#usr/lib/ldscripts/elf_i386.xn +#usr/lib/ldscripts/elf_i386.xr +#usr/lib/ldscripts/elf_i386.xs +#usr/lib/ldscripts/elf_i386.xsc +#usr/lib/ldscripts/elf_i386.xsw +#usr/lib/ldscripts/elf_i386.xu +#usr/lib/ldscripts/elf_i386.xw +#usr/lib/ldscripts/i386linux.x +#usr/lib/ldscripts/i386linux.xbn +#usr/lib/ldscripts/i386linux.xn +#usr/lib/ldscripts/i386linux.xr +#usr/lib/ldscripts/i386linux.xu +usr/lib/libbfd-2.16.1.so +#usr/lib/libbfd.a +#usr/lib/libbfd.la +usr/lib/libbfd.so +#usr/lib/libiberty.a +usr/lib/libopcodes-2.16.1.so +#usr/lib/libopcodes.a +#usr/lib/libopcodes.la +usr/lib/libopcodes.so +#usr/man +#usr/man/man1 +#usr/man/man1/addr2line.1 +#usr/man/man1/ar.1 +#usr/man/man1/as.1 +#usr/man/man1/c++filt.1 +#usr/man/man1/dlltool.1 +#usr/man/man1/gprof.1 +#usr/man/man1/ld.1 +#usr/man/man1/nlmconv.1 +#usr/man/man1/nm.1 +#usr/man/man1/objcopy.1 +#usr/man/man1/objdump.1 +#usr/man/man1/ranlib.1 +#usr/man/man1/readelf.1 +#usr/man/man1/size.1 +#usr/man/man1/strings.1 +#usr/man/man1/strip.1 +#usr/man/man1/windres.1 diff --git a/config/rootfiles/common/bzip2 b/config/rootfiles/common/bzip2 new file mode 100644 index 0000000000..2dd4eb2fe6 --- /dev/null +++ b/config/rootfiles/common/bzip2 @@ -0,0 +1,24 @@ +bin/bunzip2 +bin/bzcat +bin/bzip2 +lib/libbz2.so.1.0 +lib/libbz2.so.1.0.3 +#usr/bin/bzcmp +#usr/bin/bzdiff +#usr/bin/bzegrep +#usr/bin/bzfgrep +#usr/bin/bzgrep +#usr/bin/bzip2recover +#usr/bin/bzless +#usr/bin/bzmore +#usr/include/bzlib.h +#usr/lib/libbz2.a +usr/lib/libbz2.so +#usr/man/man1/bzcmp.1 +#usr/man/man1/bzdiff.1 +#usr/man/man1/bzegrep.1 +#usr/man/man1/bzfgrep.1 +#usr/man/man1/bzgrep.1 +#usr/man/man1/bzip2.1 +#usr/man/man1/bzless.1 +#usr/man/man1/bzmore.1 diff --git a/config/rootfiles/common/coreutils b/config/rootfiles/common/coreutils new file mode 100644 index 0000000000..b8ef6b9e87 --- /dev/null +++ b/config/rootfiles/common/coreutils @@ -0,0 +1,153 @@ +bin/[ +bin/chgrp +bin/chmod +bin/chown +bin/cp +bin/date +bin/dd +bin/df +bin/echo +bin/false +bin/head +bin/ln +bin/ls +bin/mkdir +bin/mknod +bin/mv +bin/nice +bin/rm +bin/rmdir +bin/sleep +bin/sync +bin/true +bin/uname +bin/uname.bak +usr/bin/[ +usr/bin/basename +usr/bin/cksum +usr/bin/comm +usr/bin/csplit +usr/bin/cut +usr/bin/dir +usr/bin/dircolors +usr/bin/dirname +usr/bin/du +usr/bin/env +usr/bin/expand +usr/bin/expr +usr/bin/factor +usr/bin/fmt +usr/bin/fold +usr/bin/groups +usr/bin/hostid +usr/bin/id +usr/bin/install +usr/bin/join +usr/bin/link +usr/bin/logname +usr/bin/md5sum +usr/bin/mkfifo +usr/bin/nl +usr/bin/nohup +usr/bin/od +usr/bin/paste +usr/bin/pathchk +usr/bin/pinky +usr/bin/pr +usr/bin/printenv +usr/bin/printf +usr/bin/ptx +usr/bin/readlink +usr/bin/seq +usr/bin/sha1sum +usr/bin/shred +usr/bin/sort +usr/bin/split +usr/bin/stat +usr/bin/sum +usr/bin/tac +usr/bin/tail +usr/bin/tee +usr/bin/test +usr/bin/touch +usr/bin/tr +usr/bin/tsort +usr/bin/tty +usr/bin/unexpand +usr/bin/uniq +usr/bin/unlink +usr/bin/users +usr/bin/vdir +usr/bin/wc +usr/bin/who +usr/bin/whoami +usr/bin/yes +usr/sbin/chroot +#usr/share/info/coreutils.info +#usr/share/info/dir +#usr/share/man/man1/basename.1 +#usr/share/man/man1/cat.1 +#usr/share/man/man1/chroot.1 +#usr/share/man/man1/cksum.1 +#usr/share/man/man1/comm.1 +#usr/share/man/man1/csplit.1 +#usr/share/man/man1/cut.1 +#usr/share/man/man1/date.1 +#usr/share/man/man1/dirname.1 +#usr/share/man/man1/echo.1 +#usr/share/man/man1/env.1 +#usr/share/man/man1/expand.1 +#usr/share/man/man1/expr.1 +#usr/share/man/man1/factor.1 +#usr/share/man/man1/false.1 +#usr/share/man/man1/fmt.1 +#usr/share/man/man1/fold.1 +#usr/share/man/man1/groups.1 +#usr/share/man/man1/head.1 +#usr/share/man/man1/hostid.1 +#usr/share/man/man1/hostname.1 +#usr/share/man/man1/id.1 +#usr/share/man/man1/join.1 +#usr/share/man/man1/link.1 +#usr/share/man/man1/logname.1 +#usr/share/man/man1/md5sum.1 +#usr/share/man/man1/nice.1 +#usr/share/man/man1/nl.1 +#usr/share/man/man1/nohup.1 +#usr/share/man/man1/od.1 +#usr/share/man/man1/paste.1 +#usr/share/man/man1/pathchk.1 +#usr/share/man/man1/pinky.1 +#usr/share/man/man1/pr.1 +#usr/share/man/man1/printenv.1 +#usr/share/man/man1/printf.1 +#usr/share/man/man1/ptx.1 +#usr/share/man/man1/pwd.1 +#usr/share/man/man1/readlink.1 +#usr/share/man/man1/seq.1 +#usr/share/man/man1/sha1sum.1 +#usr/share/man/man1/shred.1 +#usr/share/man/man1/sleep.1 +#usr/share/man/man1/sort.1 +#usr/share/man/man1/split.1 +#usr/share/man/man1/stat.1 +#usr/share/man/man1/stty.1 +#usr/share/man/man1/sum.1 +#usr/share/man/man1/sync.1 +#usr/share/man/man1/tac.1 +#usr/share/man/man1/tail.1 +#usr/share/man/man1/tee.1 +#usr/share/man/man1/test.1 +#usr/share/man/man1/tr.1 +#usr/share/man/man1/true.1 +#usr/share/man/man1/tsort.1 +#usr/share/man/man1/tty.1 +#usr/share/man/man1/uname.1 +#usr/share/man/man1/unexpand.1 +#usr/share/man/man1/uniq.1 +#usr/share/man/man1/unlink.1 +#usr/share/man/man1/users.1 +#usr/share/man/man1/wc.1 +#usr/share/man/man1/who.1 +#usr/share/man/man1/whoami.1 +#usr/share/man/man1/yes.1 diff --git a/config/rootfiles/common/gcc b/config/rootfiles/common/gcc index 5aa76f2879..5930b50b81 100644 --- a/config/rootfiles/common/gcc +++ b/config/rootfiles/common/gcc @@ -2,12 +2,12 @@ #usr/bin/c++ #usr/bin/cc #usr/bin/cpp -#usr/bin/g## +#usr/bin/g++ #usr/bin/gcc #usr/bin/gccbug #usr/bin/gcov #usr/bin/i586-pc-linux-gnu-c++ -#usr/bin/i586-pc-linux-gnu-g## +#usr/bin/i586-pc-linux-gnu-g++ #usr/bin/i586-pc-linux-gnu-gcc #usr/bin/i586-pc-linux-gnu-gcc-4.0.3 #usr/include/c++ @@ -337,7 +337,7 @@ #usr/lib/libsupc++.a #usr/lib/libsupc++.la #usr/man/man1/cpp.1 -#usr/man/man1/g##.1 +#usr/man/man1/g++.1 #usr/man/man1/gcc.1 #usr/man/man1/gcov.1 #usr/man/man7 diff --git a/config/rootfiles/common/gzip b/config/rootfiles/common/gzip new file mode 100644 index 0000000000..b4772643a9 --- /dev/null +++ b/config/rootfiles/common/gzip @@ -0,0 +1,27 @@ +bin/compress +bin/gunzip +bin/gzip +bin/uncompress +bin/zcat +#usr/bin/gzexe +#usr/bin/zcmp +#usr/bin/zdiff +#usr/bin/zegrep +#usr/bin/zfgrep +#usr/bin/zforce +usr/bin/zgrep +#usr/bin/zless +#usr/bin/zmore +#usr/bin/znew +#usr/info/gzip.info +#usr/man/man1/gunzip.1 +#usr/man/man1/gzexe.1 +#usr/man/man1/gzip.1 +#usr/man/man1/zcat.1 +#usr/man/man1/zcmp.1 +#usr/man/man1/zdiff.1 +#usr/man/man1/zforce.1 +#usr/man/man1/zgrep.1 +#usr/man/man1/zless.1 +#usr/man/man1/zmore.1 +#usr/man/man1/znew.1 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 30574bbbdb..6560425ce0 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -14,6 +14,7 @@ etc/issue etc/ld.so.conf etc/logrotate.conf etc/mime.types +etc/modprobe.d etc/modules.conf etc/mtab etc/nsswitch.conf diff --git a/lfs/stage2 b/lfs/stage2 index c94a7d2df3..76a12aead4 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -51,7 +51,7 @@ $(TARGET) : @$(PREBUILD) # Create directories - -mkdir -pv /{bin,boot,etc/opt,home,lib,mnt,opt} + -mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt} -mkdir -pv /{media/{floppy,cdrom},sbin,srv,var} -install -dv -m 0750 /root -install -dv -m 1777 /tmp /var/tmp diff --git a/lfs/zaptel b/lfs/zaptel index 93b10ebe40..eca99b7474 100644 --- a/lfs/zaptel +++ b/lfs/zaptel @@ -32,7 +32,7 @@ THISAPP = zaptel-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(PASS)" "SMP" +ifeq "$(PASS)" "S" TARGET = $(DIR_INFO)/$(THISAPP)-smp else TARGET = $(DIR_INFO)/$(THISAPP) @@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) # Build Zaptel cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/zaptel.patch -ifeq "$(PASS)" "SMP" +ifeq "$(PASS)" "S" cd $(DIR_APP) && make $(MAKETUNING) linux26 KVERS=$(KVER)-smp cd $(DIR_APP) && make install KVERS=$(KVER)-smp else diff --git a/make.sh b/make.sh index 19de96d664..0f43d6a03f 100644 --- a/make.sh +++ b/make.sh @@ -342,7 +342,7 @@ buildipfire() { # ipfiremake pulsar PASS=SMP # ipfiremake unicorn PASS=SMP # ipfiremake promise-sata-300-tx PASS=SMP - ipfiremake zaptel PASS=SMP + ipfiremake zaptel PASS=S ipfiremake linux # ipfiremake 3cp4218 # ipfiremake amedyn @@ -818,7 +818,7 @@ newpak) fi exit 0 ;; -prefetch) +downloadsrc) if [ ! -d $BASEDIR/cache ]; then mkdir $BASEDIR/cache fi @@ -1104,11 +1104,11 @@ watch) "") clear svn info - select name in "Exit" "IPFIRE: Prefetch" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "LOG: Tail" "Help" + select name in "Exit" "IPFIRE: Downloadsrc" "IPFIRE: Build (silent)" "IPFIRE: Watch Build" "IPFIRE: Batch" "IPFIRE: Clean" "SVN: Commit" "SVN: Update" "SVN: Status" "SVN: Diff" "LOG: Tail" "Help" do case $name in - "IPFIRE: Prefetch") - $0 prefetch + "IPFIRE: Downloadsrc") + $0 downloadsrc ;; "IPFIRE: Build (silent)") $0 build-silent @@ -1126,7 +1126,7 @@ watch) $0 svn update ;; "Help") - echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|prefetch|shell|sync|toolchain}" + echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|downloadsrc|shell|sync|toolchain}" cat doc/make.sh-usage ;; "LOG: Tail") @@ -1139,7 +1139,7 @@ watch) done ;; *) - echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|prefetch|shell|sync|toolchain}" + echo "Usage: $0 {build|changelog|clean|gettoolchain|newpak|downloadsrc|shell|sync|toolchain}" cat doc/make.sh-usage ;; esac -- 2.39.2