Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

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

diff --git a/make.sh b/make.sh
index 5aabdf80b717ad0dd09d890364b30cc64bb78299..fa153c445c972f976a6ae325c23d254fed4ca81e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.15"                                                 # Version number
 CORE="76-beta1"                                                        # Core Level (Filename)
-PAKFIRE_CORE="75"                                              # Core Level (PAKFIRE)
+PAKFIRE_CORE="76"                                              # 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
@@ -731,7 +731,6 @@ buildipfire() {
   ipfiremake usb_modeswitch_data
   ipfiremake zerofree
   ipfiremake mdadm
-  ipfiremake eject
   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue
@@ -768,7 +767,6 @@ buildipfire() {
   ipfiremake stress
   ipfiremake libstatgrab
   ipfiremake sarg
-  ipfiremake fstrim
   ipfiremake check_mk_agent
   ipfiremake libdaemon
   ipfiremake avahi