Add core version to all imagenames

diff --git a/lfs/cdrom b/lfs/cdrom
index 45de6f7a7414ae0a4b94ce69ec5c792e726648bd..0773547ae43d37e6351e62ca061a90ba34953a96 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -48,8 +48,6 @@ md5 :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf /install/cdrom /tmp/*
 
-       cp -f $(DIR_SRC)/config/rootfiles/cdrom_corever /opt/pakfire/db/core/mine
-
        # Compress root filesystem
        # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
        mkdir -p /install/cdrom/doc
@@ -91,4 +89,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                                xargs md5sum > md5sum.txt; \
        cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
            -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-           -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED).iso
+           -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED)-core$(CORE).iso

diff --git a/lfs/usb-stick b/lfs/usb-stick
index 29486103b5c412b1d0d613f94054e40c0dadee20..76b97024fcebec6685f5c0b4c706ecd64c0fa8e4 100644 (file)
--- a/lfs/usb-stick
+++ b/lfs/usb-stick
@@ -44,8 +44,8 @@ md5 :
 ###############################################################################
 # Installation Details
 ###############################################################################
-IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE).img
-IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE).img
+IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE)-$(ED)-core$(CORE).img
+IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE)-$(ED)-core$(CORE).img
 IMGfs  := /install/images/fs
 
 ifeq "$(ED)" "devel"

diff --git a/make.sh b/make.sh
index 2f938dd7aeb1b5e6ecb1bc29c1c8c32e25f4c9b7..5263f5c7dae5249c3fbcc2b61bcf6184a22a6622 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,6 +25,7 @@
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
 VERSION="2.3"
+CORE="27"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -597,6 +598,7 @@ buildipfire() {
   git status >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
+  echo $(CORE) > $BASEDIR/build/opt/pakfire/db/core/mine
 }
 
 buildinstaller() {

diff --git a/tools/make-functions b/tools/make-functions
index a357d0620122dac818e1e90b4c20577aa61a9e42..00d7d337cd6eab53c2274b270e9c483106176672 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -397,6 +397,7 @@ ipfiremake() {
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
                                                VERSION=$VERSION \
+                                               CORE=$CORE \
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \