X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=f74288d5319af7995cbbb08ef9b95a0873115509;hb=f16bcc3e310ef5118dfbf3258306ab20d6b93916;hp=98686b010b810334927c19acacecaf04a04ddd56;hpb=544f40d4f87f6705e680a5da031cd917f24e140c;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/make.sh b/make.sh index 98686b010..f74288d53 100755 --- a/make.sh +++ b/make.sh @@ -17,16 +17,16 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2012 IPFire Team . # +# Copyright (C) 2007-2013 IPFire Team . # # # ############################################################################ # NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.11" # Version number -CORE="62" # Core Level (Filename) -PAKFIRE_CORE="61" # Core Level (PAKFIRE) +VERSION="2.13" # Version number +CORE="72" # Core Level (Filename) +PAKFIRE_CORE="71" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=5 +TOOLCHAINVER=6 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -258,7 +258,7 @@ buildtoolchain() { lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 - lfsmake1 linux2 TOOLS=1 HEADERS=1 + lfsmake1 linux TOOLS=1 KCFG="-headers" lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 lfsmake1 binutils PASS=2 @@ -294,7 +294,7 @@ buildbase() { LOGFILE="$BASEDIR/log/_build.base.log" export LOGFILE lfsmake2 stage2 - lfsmake2 linux2 HEADERS=1 + lfsmake2 linux KCFG="-headers" lfsmake2 man-pages lfsmake2 glibc lfsmake2 tzdata @@ -336,6 +336,7 @@ buildbase() { lfsmake2 gzip lfsmake2 inetutils lfsmake2 iproute2 + lfsmake2 jwhois lfsmake2 kbd lfsmake2 less lfsmake2 make @@ -362,6 +363,7 @@ buildipfire() { export LOGFILE ipfiremake configroot ipfiremake backup + ipfiremake bind ipfiremake dhcp ipfiremake dhcpcd ipfiremake libusb @@ -371,94 +373,78 @@ buildipfire() { ipfiremake unzip ipfiremake which ipfiremake linux-firmware + ipfiremake dvb-firmwares ipfiremake zd1211-firmware ipfiremake rpi-firmware - ipfiremake fw_ath9k_htc ipfiremake u-boot - # The xen and PAE kernels are only available for x86 if [ "${MACHINE_TYPE}" != "arm" ]; then + + # x86-xen (Legacy XEN) kernel build ipfiremake linux2 KCFG="-xen" -# ipfiremake v4l-dvb KCFG="-xen" -# ipfiremake mISDN KCFG="-xen" + ipfiremake v4l-dvb KCFG="-xen" + ipfiremake mISDN KCFG="-xen" ipfiremake cryptodev KCFG="-xen" - ipfiremake compat-wireless KCFG="-xen" -# ipfiremake r8169 KCFG="-xen" -# ipfiremake r8168 KCFG="-xen" -# ipfiremake r8101 KCFG="-xen" -# ipfiremake e1000 KCFG="-xen" -# ipfiremake e1000e KCFG="-xen" -# ipfiremake igb KCFG="-xen" - + ipfiremake compat-drivers KCFG="-xen" + ipfiremake r8169 KCFG="-xen" + ipfiremake r8168 KCFG="-xen" + ipfiremake r8101 KCFG="-xen" + ipfiremake e1000 KCFG="-xen" + ipfiremake e1000e KCFG="-xen" + ipfiremake igb KCFG="-xen" + + # x86-pae (Native and new XEN) kernel build ipfiremake linux KCFG="-pae" -# ipfiremake kvm-kmod KCFG="-pae" -# ipfiremake v4l-dvb KCFG="-pae" - ipfiremake alsa KCFG="-pae" KMOD=1 -# ipfiremake mISDN KCFG="-pae" + ipfiremake kvm-kmod KCFG="-pae" + ipfiremake v4l-dvb KCFG="-pae" + ipfiremake mISDN KCFG="-pae" ipfiremake cryptodev KCFG="-pae" - ipfiremake compat-wireless KCFG="-pae" -# ipfiremake r8169 KCFG="-pae" -# ipfiremake r8168 KCFG="-pae" -# ipfiremake r8101 KCFG="-pae" -# ipfiremake e1000 KCFG="-pae" -# ipfiremake e1000e KCFG="-pae" -# ipfiremake igb KCFG="-pae" - + ipfiremake compat-drivers KCFG="-pae" + ipfiremake r8169 KCFG="-pae" + ipfiremake r8168 KCFG="-pae" + ipfiremake r8101 KCFG="-pae" + ipfiremake e1000e KCFG="-pae" + ipfiremake igb KCFG="-pae" + + # x86 kernel build ipfiremake linux KCFG="" -# ipfiremake kvm-kmod KCFG="" -# ipfiremake v4l-dvb KCFG="" - ipfiremake alsa KCFG="" KMOD=1 -# ipfiremake mISDN KCFG="" + ipfiremake kvm-kmod KCFG="" + ipfiremake v4l-dvb KCFG="" + ipfiremake mISDN KCFG="" ipfiremake cryptodev KCFG="" - ipfiremake compat-wireless KCFG="" -# ipfiremake r8169 KCFG="" -# ipfiremake r8168 KCFG="" -# ipfiremake r8101 KCFG="" -# ipfiremake e1000 KCFG="" -# ipfiremake e1000e KCFG="" -# ipfiremake igb KCFG="" + ipfiremake compat-drivers KCFG="" + ipfiremake r8169 KCFG="" + ipfiremake r8168 KCFG="" + ipfiremake r8101 KCFG="" + ipfiremake e1000e KCFG="" + ipfiremake igb KCFG="" else - # arm-omap kernel build + # arm-rpi (Raspberry Pi) kernel build ipfiremake linux KCFG="-rpi" -# ipfiremake v4l-dvb KCFG="-rpi" -# ipfiremake kvm-kmod KCFG="-rpi" -# ipfiremake mISDN KCFG="-rpi" + ipfiremake v4l-dvb KCFG="-rpi" + ipfiremake mISDN KCFG="-rpi" NOPCI=1 ipfiremake cryptodev KCFG="-rpi" - ipfiremake compat-wireless KCFG="-rpi" -# ipfiremake r8169 KCFG="-rpi" -# ipfiremake r8168 KCFG="-rpi" -# ipfiremake r8101 KCFG="-rpi" -# ipfiremake e1000 KCFG="-rpi" -# ipfiremake e1000e KCFG="-rpi" -# ipfiremake igb KCFG="-rpi" + ipfiremake compat-drivers KCFG="-rpi" + # arm-omap (Panda Board) kernel build ipfiremake linux KCFG="-omap" -# ipfiremake v4l-dvb KCFG="-omap" -# ipfiremake kvm-kmod KCFG="-omap" -# ipfiremake mISDN KCFG="-omap" + ipfiremake v4l-dvb KCFG="-omap" + ipfiremake mISDN KCFG="-omap" NOPCI=1 ipfiremake cryptodev KCFG="-omap" - ipfiremake compat-wireless KCFG="-omap" -# ipfiremake r8169 KCFG="-omap" -# ipfiremake r8168 KCFG="-omap" -# ipfiremake r8101 KCFG="-omap" -# ipfiremake e1000 KCFG="-omap" -# ipfiremake e1000e KCFG="-omap" -# ipfiremake igb KCFG="-omap" - - # arm-kirkwood kernel build + ipfiremake compat-drivers KCFG="-omap" + + # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" -# ipfiremake v4l-dvb KCFG="-kirkwood" -# ipfiremake kvm-kmod KCFG="-kirkwood" -# ipfiremake mISDN KCFG="-kirkwood" + ipfiremake v4l-dvb KCFG="-kirkwood" + ipfiremake mISDN KCFG="-kirkwood" ipfiremake cryptodev KCFG="-kirkwood" - ipfiremake compat-wireless KCFG="-kirkwood" -# ipfiremake r8169 KCFG="-kirkwood" -# ipfiremake r8168 KCFG="-kirkwood" -# ipfiremake r8101 KCFG="-kirkwood" -# ipfiremake e1000 KCFG="-kirkwood" + ipfiremake compat-drivers KCFG="-kirkwood" + ipfiremake r8169 KCFG="-kirkwood" + ipfiremake r8168 KCFG="-kirkwood" + ipfiremake r8101 KCFG="-kirkwood" # ipfiremake e1000e KCFG="-kirkwood" -# ipfiremake igb KCFG="-kirkwood" + ipfiremake igb KCFG="-kirkwood" fi ipfiremake pkg-config @@ -477,6 +463,7 @@ buildipfire() { ipfiremake libnet ipfiremake libnl ipfiremake libidn + ipfiremake nasm ipfiremake libjpeg ipfiremake libexif ipfiremake libpng @@ -504,7 +491,6 @@ buildipfire() { ipfiremake apache2 PASS=C ipfiremake arping ipfiremake beep - ipfiremake bind ipfiremake dvdrtools ipfiremake dnsmasq ipfiremake dosfstools @@ -525,7 +511,9 @@ buildipfire() { ipfiremake mtools ipfiremake initscripts ipfiremake whatmask + ipfiremake libmnl ipfiremake iptables + ipfiremake conntrack-tools ipfiremake libupnp ipfiremake ipaddr ipfiremake iputils @@ -533,12 +521,10 @@ buildipfire() { ipfiremake mISDNuser ipfiremake capi4k-utils ipfiremake hwdata - ipfiremake kudzu ipfiremake logrotate ipfiremake logwatch ipfiremake misc-progs ipfiremake nano - ipfiremake nasm ipfiremake URI ipfiremake HTML-Tagset ipfiremake HTML-Parser @@ -551,6 +537,7 @@ buildipfire() { ipfiremake Net-IPv4Addr ipfiremake Net_SSLeay ipfiremake IO-Stringy + ipfiremake IO-Socket-SSL ipfiremake Unix-Syslog ipfiremake Mail-Tools ipfiremake MIME-Tools @@ -577,6 +564,7 @@ buildipfire() { ipfiremake ntp ipfiremake openssh ipfiremake fontconfig + ipfiremake dejavu-fonts-ttf ipfiremake freefont ipfiremake pixman ipfiremake cairo @@ -604,6 +592,7 @@ buildipfire() { ipfiremake ghostscript ipfiremake foomatic ipfiremake hplip + ipfiremake cifs-utils ipfiremake samba ipfiremake sudo ipfiremake mc @@ -638,7 +627,6 @@ buildipfire() { ipfiremake libsigc++ ipfiremake libtorrent ipfiremake rtorrent - ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent @@ -676,8 +664,10 @@ buildipfire() { ipfiremake dfb++ ipfiremake faad2 ipfiremake ffmpeg - ipfiremake videolan ipfiremake vdr + ipfiremake vdr_streamdev + ipfiremake vdr_vnsiserver3 + ipfiremake vdr_epgsearch ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator @@ -692,6 +682,7 @@ buildipfire() { ipfiremake iw ipfiremake wpa_supplicant ipfiremake hostapd + ipfiremake pycurl ipfiremake urlgrabber ipfiremake syslinux ipfiremake tftpd @@ -710,6 +701,7 @@ buildipfire() { ipfiremake mediatomb ipfiremake sslh ipfiremake perl-gettext + ipfiremake perl-Sort-Naturally ipfiremake vdradmin ipfiremake miau ipfiremake netsnmpd @@ -750,7 +742,6 @@ buildipfire() { ipfiremake python-progressbar ipfiremake python-xattr ipfiremake intltool - ipfiremake pakfire3-deps ipfiremake transmission ipfiremake dpfhack ipfiremake lcd4linux @@ -758,6 +749,38 @@ buildipfire() { ipfiremake tcpick ipfiremake minidlna ipfiremake acpid + ipfiremake fping + ipfiremake telnet + ipfiremake libgpg-error + ipfiremake libassuan + ipfiremake gpgme + ipfiremake pygpgme + ipfiremake pakfire3 + ipfiremake stress + ipfiremake libstatgrab + ipfiremake sarg + ipfiremake fstrim + ipfiremake check_mk_agent + ipfiremake libdaemon + ipfiremake avahi + ipfiremake nginx + ipfiremake sendEmail + ipfiremake sysbench + ipfiremake strace + ipfiremake ipfire-netboot + ipfiremake lcdproc + ipfiremake bitstream + ipfiremake multicat + ipfiremake keepalived + ipfiremake ipvsadm + ipfiremake perl-Carp-Clan + ipfiremake perl-Date-Calc + ipfiremake perl-Date-Manip + ipfiremake perl-File-Tail + ipfiremake perl-TimeDate + ipfiremake swatch + ipfiremake tor + ipfiremake arm echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild @@ -767,11 +790,19 @@ buildipfire() { echo >> $BASEDIR/build/var/ipfire/firebuild cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine - if [ "$GIT_BRANCH" = "master" -o "$GIT_BRANCH" = "next" ]; then - echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release + if [ "$(git status -s | wc -l)" == "0" ]; then + GIT_STATUS="" else - echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release + GIT_STATUS="-dirty" fi + case "$GIT_BRANCH" in + core*|beta?|rc?) + echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release + ;; + *) + echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release + ;; + esac } buildinstaller() { @@ -832,6 +863,8 @@ buildpackages() { if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/ cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/ + cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/ + cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/ ipfiremake xen-image rm -rf $LFS/install/packages/linux-xen-*.ipfire rm -rf $LFS/install/packages/meta-linux-xen @@ -868,7 +901,7 @@ ipfirepackages() { ipfiremake core-updates local i - for i in $(find $BASEDIR/config/rootfiles/packages{${machine},} -maxdepth 1 -type f); do + for i in $(find $BASEDIR/config/rootfiles/packages{/${MACHINE},} -maxdepth 1 -type f); do i=$(basename ${i}) if [ -e $BASEDIR/lfs/$i ]; then ipfiredist $i @@ -926,6 +959,7 @@ build) cd $BASEDIR tools/checknewlog.pl + tools/checkwronginitlinks cd $PWD beautify build_end