Set default font to LatArCyrHeb-16.

[ipfire-3.x.git] / make.sh

diff --git a/make.sh b/make.sh
index ca3f7c1fbe465fc5473453a0b83604975dab38b4..1111ec8155f956eca7941f2198fd24173352fd76 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"                  # Software name
 SNAME="ipfire"                 # Short name
-VERSION="3.0-prealpha1"                # Version number
-TOOLCHAINVERSION="${VERSION}-10"       # Toolchain
+VERSION="3.0-alpha1"           # Version number
+TOOLCHAINVERSION="${VERSION}-1"        # Toolchain
 SLOGAN="Lechery"               # Software slogan
 
 # Include funtions
@@ -42,25 +42,28 @@ toolchain_build() {
        STAGE_ORDER=01
        STAGE=toolchain
 
-       LOGFILE="$BASEDIR/log_${MACHINE}/_build.${STAGE_ORDER}-toolchain.log"
+       LOGFILE="$BASEDIR/log_${TARGET}/_build.${STAGE_ORDER}-toolchain.log"
        export LOGFILE
 
        build_spy stage ${STAGE}
 
+       # We can't skip packages in toolchain stage
+       SAVE_SKIP_PACKAGE_LIST=$SKIP_PACKAGE_LIST
+       SKIP_PACKAGE_LIST=
+
        toolchain_make stage1
        # make distcc first so that CCACHE_PREFIX works immediately
-       [ -z "$DISTCC_HOSTS" ] || toolchain_make distcc
+       toolchain_make distcc
        toolchain_make ccache
-       toolchain_make gmp
-       toolchain_make mpfr
-       toolchain_make linux
        toolchain_make binutils         PASS=1
        toolchain_make gcc              PASS=1
+       toolchain_make linux-headers
        toolchain_make glibc
        toolchain_make adjust-toolchain
        toolchain_make test-toolchain   PASS=1
-       toolchain_make binutils         PASS=2
+       toolchain_make zlib
        toolchain_make gcc              PASS=2
+       toolchain_make binutils         PASS=2
        toolchain_make test-toolchain   PASS=2
        toolchain_make ncurses
        toolchain_make bash
@@ -84,7 +87,7 @@ toolchain_build() {
        toolchain_make bc
        toolchain_make util-linux-ng
        toolchain_make strip
-       export PATH=$ORG_PATH
+       export PATH=$ORG_PATH SKIP_PACKAGE_LIST=$SAVE_SKIP_PACKAGE_LIST
 }
 
 ################################################################################
@@ -96,20 +99,19 @@ base_build() {
        STAGE_ORDER=02
        STAGE=base
 
-       LOGFILE="$BASEDIR/log_${MACHINE}/_build.${STAGE_ORDER}-base.log"
+       LOGFILE="$BASEDIR/log_${TARGET}/_build.${STAGE_ORDER}-base.log"
        export LOGFILE
 
        build_spy stage ${STAGE}
 
        ipfire_make stage2
        ipfire_make scripts
-       ipfire_make gmp
-       ipfire_make mpfr
-       ipfire_make linux
+       ipfire_make linux-headers
        ipfire_make man-pages
        ipfire_make glibc
        ipfire_make adjust-toolchain
        ipfire_make test-toolchain
+       ipfire_make zlib
        ipfire_make binutils
        ipfire_make gcc
        ipfire_make berkeley
@@ -122,12 +124,12 @@ base_build() {
        ipfire_make ncurses
        ipfire_make procps
        ipfire_make libtool
-       ipfire_make zlib
        ipfire_make perl
        ipfire_make readline
        ipfire_make gettext
        ipfire_make make
        ipfire_make libidn
+       ipfire_make pkg-config
        ipfire_make attr
        ipfire_make libcap2
        ipfire_make paxctl
@@ -136,11 +138,14 @@ base_build() {
        ipfire_make bash
        ipfire_make bzip2
        ipfire_make diffutils
+       ipfire_make eventlog
        ipfire_make file
        ipfire_make findutils
        ipfire_make flex
+       ipfire_make gmp
        ipfire_make grub
        ipfire_make gawk
+       ipfire_make glib2
        ipfire_make grep
        ipfire_make groff
        ipfire_make gzip
@@ -152,10 +157,11 @@ base_build() {
        ipfire_make less
        ipfire_make man-db
        ipfire_make module-init-tools
+       ipfire_make mpfr
        ipfire_make patch
        ipfire_make psmisc
        ipfire_make shadow
-       ipfire_make sysklogd
+       ipfire_make syslog-ng
        ipfire_make sysvinit
        ipfire_make tar
        ipfire_make texinfo
@@ -172,7 +178,7 @@ ipfire_build() {
        STAGE_ORDER=03
        STAGE=ipfire
 
-       LOGFILE="$BASEDIR/log_${MACHINE}/_build.${STAGE_ORDER}-ipfire.log"
+       LOGFILE="$BASEDIR/log_${TARGET}/_build.${STAGE_ORDER}-ipfire.log"
        export LOGFILE
 
        build_spy stage ${STAGE}
@@ -182,28 +188,28 @@ ipfire_build() {
        ipfire_make stage3
        ipfire_make lzma
 
-       ipfire_make linux       
+       ipfire_make linux
        ipfire_make aufs
 
        ### Building some general stuff
        #   STAGE 1
-       ipfire_make pkg-config
+       ipfire_make libdaemon
+       ipfire_make pcre
        ipfire_make expat
-       ipfire_make glib
        ipfire_make dbus
        ipfire_make dbus-glib
        ipfire_make openssl
-       ipfire_make perl                        ### We are building the modules here.
+       ipfire_make perl-xml-parser
+       ipfire_make intltool
        ipfire_make python
        ipfire_make python-dbus
        ipfire_make python-urlgrabber
-       ipfire_make python-iconv
        ipfire_make python-IPy
        ipfire_make libxml2
        ipfire_make libxslt
-       ipfire_make pcre
        ipfire_make popt
        ipfire_make libusb
+       ipfire_make libusb-compat       # Can be removed if usbutils supports libusb-1.0
        ipfire_make bc
        ipfire_make mingetty
        
@@ -226,12 +232,18 @@ ipfire_build() {
        ipfire_make vlan
        ipfire_make bind
        ipfire_make whois
+       ipfire_make avahi
        
        ### Building some general stuff
        #   STAGE 2
+       ipfire_make pth
+       ipfire_make libassuan
+       ipfire_make libgpg-error
+       ipfire_make libgcrypt
+       ipfire_make libksba
        ipfire_make cracklib
        ipfire_make pam                                 PASS=1
-       ipfire_make shadow
+       ipfire_make shadow-pam
        ipfire_make pam                                 PASS=2
        ipfire_make slang
        ipfire_make newt
@@ -241,7 +253,8 @@ ipfire_build() {
        ipfire_make nss_ldap
        ipfire_make sqlite
        ipfire_make curl
-       ipfire_make gnupg
+       ipfire_make pinentry
+       ipfire_make gnupg2
        ipfire_make sudo
        ipfire_make libjpeg
        ipfire_make libpng
@@ -273,7 +286,10 @@ ipfire_build() {
        ipfire_make xfsprogs
        ipfire_make sysfsutils
        ipfire_make squashfs
-               
+       ipfire_make dosfstools
+       ipfire_make lvm2
+       ipfire_make mdadm
+
        ### Building hardware utils
        #
        ipfire_make pciutils
@@ -281,6 +297,7 @@ ipfire_build() {
        ipfire_make hdparm
        ipfire_make smartmontools
        ipfire_make lm-sensors
+       ipfire_make parted
        ipfire_make hal
        ipfire_make hal-info
 
@@ -302,23 +319,15 @@ ipfire_build() {
        #ipfire_make logwatch   
        ipfire_make cpio
        ipfire_make cdrtools
-       ipfire_make parted
        ipfire_make python-parted
        ipfire_make memtest86+
        #ipfire_make pakfire
-       
-       ipfire_make pyfire
-  
-       ### -------------------------------------------------------------------------
-       ### Tools that maybe not needed
-       #
-       #ipfire_make gd
-       #ipfire_make libcap
-       #ipfire_make mtools
+       ipfire_make quagga
        #ipfire_make mISDN
-       
        #ipfire_make wireless
-       #ipfire_make libsafe
+
+       ipfire_make pyfire
+       ipfire_make firewall
 }
 
 ################################################################################
@@ -330,14 +339,14 @@ misc_build() {
        STAGE_ORDER=04
        STAGE=misc
 
-       LOGFILE="$BASEDIR/log_${MACHINE}/_build.${STAGE_ORDER}-misc.log"
+       LOGFILE="$BASEDIR/log_${TARGET}/_build.${STAGE_ORDER}-misc.log"
        export LOGFILE
 
        build_spy stage ${STAGE}
 
        ipfire_make stage4
 
-       #ipfire_make miniupnpd
+       ipfire_make miniupnpd
 
        ### Console tools
        #
@@ -345,7 +354,7 @@ misc_build() {
        #ipfire_make traceroute
        #ipfire_make nmap
        #ipfire_make rsync
-       #ipfire_make tcpdump
+       ipfire_make tcpdump
        ipfire_make htop
        ipfire_make nano
        ipfire_make squid
@@ -359,8 +368,6 @@ misc_build() {
        ipfire_make mkinitramfs
        ipfire_make splashy
 
-       #ipfire_make squidguard         ## CAN THIS BE BANISHED BY ANYTHING BETTER?
-       #ipfire_make calamaris          ## CAN THIS BE BANISHED BY ANYTHING BETTER?
        #ipfire_make vsftpd
 
        ## NTFS
@@ -378,9 +385,6 @@ misc_build() {
        #
        #ipfire_make snort
        #ipfire_make oinkmaster
-       #ipfire_make centerim
-       #ipfire_make tripwire
-       #ipfire_make java
        #ipfire_make cups
        #ipfire_make ghostscript
        #ipfire_make foomatic
@@ -393,37 +397,16 @@ misc_build() {
        #ipfire_make alsa
        #ipfire_make mpfire
        #ipfire_make guardian
-       #ipfire_make libid3tag
-       #ipfire_make libmad
-       #ipfire_make libogg
-       #ipfire_make libvorbis
-       #ipfire_make lame
-       #ipfire_make sox
-       #ipfire_make libshout
-       #ipfire_make icecast
-       #ipfire_make icegenerator
-       #ipfire_make mpd
-       #ipfire_make mpc
-       #ipfire_make xvid
-       #ipfire_make libmpeg2
-       #ipfire_make videolan
-       #ipfire_make libpri
-       #ipfire_make asterisk
-       #ipfire_make libsigc++
-       #ipfire_make applejuice
-       #ipfire_make libtorrent
-       #ipfire_make rtorrent
        #ipfire_make ipfireseeder
        #ipfire_make nfs
 
-       # ---------------------------------------------------------------------------
-       #ipfire_make as86
-       #ipfire_make mbr
-
        ### Debugging
        #
+       ipfire_make pax-utils
+       ipfire_make paxtest
        ipfire_make gdb
        ipfire_make strace
+       ipfire_make pychecker
 }
 
 ################################################################################
@@ -435,7 +418,7 @@ installer_build() {
        STAGE_ORDER=05
        STAGE=installer
 
-       LOGFILE="$BASEDIR/log_${MACHINE}/_build.${STAGE_ORDER}-installer.log"
+       LOGFILE="$BASEDIR/log_${TARGET}/_build.${STAGE_ORDER}-installer.log"
        export LOGFILE
 
        build_spy stage ${STAGE}
@@ -453,7 +436,7 @@ packages_build() {
        STAGE_ORDER=06
        STAGE=packages
 
-       LOGFILE="$BASEDIR/log_${MACHINE}/_build.${STAGE_ORDER}-packages.log"
+       LOGFILE="$BASEDIR/log_${TARGET}/_build.${STAGE_ORDER}-packages.log"
        export LOGFILE
 
        build_spy stage ${STAGE}
@@ -463,6 +446,11 @@ packages_build() {
        # Generate ChangeLog
        git_log
 
+       # Generate packages list
+       echo -n "Generating packages list"
+       pkg_list_packages > $BASEDIR/doc/packages-list.txt
+       beautify message DONE
+
        if [ ${EMB} -eq 0 ]; then
                ipfire_make initramfs
                ipfire_make images