From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 15 Feb 2009 23:11:51 +0000 (+0100)
Subject: Add core version to all imagenames
X-Git-Tag: v2.5-beta1~168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a01fc4746ba7fa8257e94300b4396fd6c4662f4f;p=ipfire-2.x.git

Add core version to all imagenames
---

diff --git a/lfs/cdrom b/lfs/cdrom
index 45de6f7a74..0773547ae4 100644
--- 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 29486103b5..76b97024fc 100644
--- 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 2f938dd7ae..5263f5c7da 100755
--- 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 a357d06201..00d7d337cd 100644
--- 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" \