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

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

diff --git a/make.sh b/make.sh
index bb4269d5d5fe56837adf1cc18356cffb507b4667..b4d5ea7a39dbfc6d688aed44034fb1c621df3dbe 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,10 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
+<<<<<<< HEAD
 VERSION="2.23"                                                 # Version number
-CORE="130"                                                     # Core Level (Filename)
-PAKFIRE_CORE="129"                                             # Core Level (PAKFIRE)
+CORE="131"                                                     # Core Level (Filename)
+PAKFIRE_CORE="130"                                             # 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
@@ -1084,6 +1085,7 @@ buildipfire() {
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
   lfsmake2 popt
+  lfsmake2 libedit
   lfsmake2 libusb
   lfsmake2 libusb-compat
   lfsmake2 libpcap
@@ -1097,6 +1099,7 @@ buildipfire() {
   lfsmake2 zd1211-firmware
   lfsmake2 rpi-firmware
   lfsmake2 intel-microcode
+  lfsmake2 pcengines-apu-firmware
   lfsmake2 bc
   lfsmake2 u-boot MKIMAGE=1
   lfsmake2 cpio
@@ -1587,10 +1590,11 @@ buildipfire() {
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
   lfsmake2 borgbackup
-  lfsmake2 libedit
   lfsmake2 knot
   lfsmake2 spectre-meltdown-checker
   lfsmake2 zabbix_agentd
+  lfsmake2 flashrom
+  lfsmake2 firmware-update
 }
 
 buildinstaller() {