Merge branch 'kernel-test' into seventeen

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index d3ca985a7c5c00482904139c9003ee1d398f024d..e6a648b563f4c866cc458a6e5b7118b83c45a744 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name

-VERSION="2.15"                                                 # Version number
-CORE="84"                                                      # Core Level (Filename)
-PAKFIRE_CORE="84"                                              # Core Level (PAKFIRE)
+VERSION="2.17"                                                 # Version number
+CORE="86"                                                      # Core Level (Filename)
+PAKFIRE_CORE="85"                                              # Core Level (PAKFIRE)

 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir


@@ -36,7 +36,7 @@ BUILD_IMAGES=1                                                        # Flash and Xen Downloader
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit

-TOOLCHAINVER=7
+TOOLCHAINVER=8

 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"
 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"


@@ -362,7 +362,6 @@ buildbase() {
     lfsmake2 less
     lfsmake2 make
     lfsmake2 man
     lfsmake2 less
     lfsmake2 make
     lfsmake2 man

-    lfsmake2 mktemp

     lfsmake2 kmod
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 kmod
     lfsmake2 net-tools
     lfsmake2 patch


@@ -377,7 +376,6 @@ buildbase() {
     lfsmake2 vim
     lfsmake2 xz
     lfsmake2 paxctl
     lfsmake2 vim
     lfsmake2 xz
     lfsmake2 paxctl

-    lfsmake2 grub

 }
 
 buildipfire() {
 }
 
 buildipfire() {


@@ -398,6 +396,13 @@ buildipfire() {
   ipfiremake rpi-firmware
   ipfiremake bc
   ipfiremake u-boot
   ipfiremake rpi-firmware
   ipfiremake bc
   ipfiremake u-boot

+  ipfiremake cpio
+  ipfiremake mdadm
+  ipfiremake dracut
+  ipfiremake lvm2
+  ipfiremake multipath-tools
+  ipfiremake freetype
+  ipfiremake grub

 
   case "${TARGET_ARCH}" in
        i586)
 
   case "${TARGET_ARCH}" in
        i586)


@@ -471,8 +476,6 @@ buildipfire() {
   ipfiremake dhcpcd
   ipfiremake boost
   ipfiremake linux-atm
   ipfiremake dhcpcd
   ipfiremake boost
   ipfiremake linux-atm

-  ipfiremake cpio
-  ipfiremake dracut

   ipfiremake expat
   ipfiremake gdbm
   ipfiremake pam
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake pam


@@ -491,12 +494,12 @@ buildipfire() {
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libart
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libart

-  ipfiremake freetype

   ipfiremake gd
   ipfiremake popt
   ipfiremake pcre
   ipfiremake slang
   ipfiremake newt
   ipfiremake gd
   ipfiremake popt
   ipfiremake pcre
   ipfiremake slang
   ipfiremake newt

+  ipfiremake libsmooth

   ipfiremake attr
   ipfiremake acl
   ipfiremake libcap
   ipfiremake attr
   ipfiremake acl
   ipfiremake libcap


@@ -752,7 +755,6 @@ buildipfire() {
   ipfiremake usb_modeswitch
   ipfiremake usb_modeswitch_data
   ipfiremake zerofree
   ipfiremake usb_modeswitch
   ipfiremake usb_modeswitch_data
   ipfiremake zerofree

-  ipfiremake mdadm

   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue
   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue


@@ -819,6 +821,7 @@ buildipfire() {
   ipfiremake batctl
   ipfiremake perl-PDF-API2
   ipfiremake squid-accounting
   ipfiremake batctl
   ipfiremake perl-PDF-API2
   ipfiremake squid-accounting

+  ipfiremake pigz

 }
 
 buildinstaller() {
 }
 
 buildinstaller() {


@@ -828,7 +831,6 @@ buildinstaller() {
   ipfiremake memtest
   ipfiremake installer
   installmake strip
   ipfiremake memtest
   ipfiremake installer
   installmake strip

-  ipfiremake initrd

 }
 
 buildpackages() {
 }
 
 buildpackages() {


@@ -865,6 +867,7 @@ buildpackages() {
   modprobe loop 2>/dev/null
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images
   modprobe loop 2>/dev/null
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images

+       ipfiremake flash-images SCON=1

   fi
 
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
   fi
 
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1