From b0652dc6045b5164f4a0180dc755faf3d23ce415 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Sun, 06 Dec 2015 15:13:40 -0500
Subject: build/roms/*: use .coreboot-version, not lbversion in CBFS

---
diff --git a/resources/scripts/helpers/build/roms/withdepthcharge b/resources/scripts/helpers/build/roms/withdepthcharge
index 03cda06..13b4a77 100755
--- a/resources/scripts/helpers/build/roms/withdepthcharge
+++ b/resources/scripts/helpers/build/roms/withdepthcharge
@@ -78,7 +78,7 @@ buildcoreboot() {
 	cd "coreboot/"
 
 	make distclean
-	rm -f "lbversion"
+	rm -f ".coreboot-version"
 	rm -f *.img
 
 	if [ -f "../version" ]; then
@@ -88,7 +88,6 @@ buildcoreboot() {
 		# git repo is being used
 		version="$(git describe --tags HEAD)" # note: in libreboot, coreboot/.git doesn't exist, this uses libreboot .git
 	fi
-	printf '%s\n' "${version}" > "lbversion"
 	printf 'libreboot-%s' "${version}" > "ro-frid"
 	printf 'libreboot-%s\n' "${version}" > ".coreboot-version" # needed for reproducible builds in coreboot
 
@@ -96,7 +95,7 @@ buildcoreboot() {
 	make -j"$(nproc)"
 
 	# Add version information to this image
-	./util/cbfstool/cbfstool "build/coreboot.rom" add -f lbversion -n lbversion -t raw
+	./util/cbfstool/cbfstool "build/coreboot.rom" add -f .coreboot-version -n lbversion -t raw
 
 	cbfs_size=$( grep CONFIG_CBFS_SIZE ".config" | sed "s/.*[[:space:]]*=[[:space:]]*//g" )
 	cbfs_size=$( printf "%d\n" "$cbfs_size" )
diff --git a/resources/scripts/helpers/build/roms/withgrub_helper b/resources/scripts/helpers/build/roms/withgrub_helper
index 40aa6cb..349b6b1 100755
--- a/resources/scripts/helpers/build/roms/withgrub_helper
+++ b/resources/scripts/helpers/build/roms/withgrub_helper
@@ -45,7 +45,6 @@ else
 	# git repo is being used
 	version="$(git describe --tags HEAD)"
 fi
-printf '%s\n' "${version}" >"lbversion"
 printf 'libreboot-%s\n' "${version}" > ".coreboot-version" # needed for reproducible builds in coreboot
 
 # Build ROM images with text-mode and corebootfb modes.
@@ -92,7 +91,7 @@ do
 	rm -f ".config"
 
 	# Add version information to this image
-	./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f lbversion -n lbversion -t raw
+	./util/cbfstool/cbfstool "${boardtarget}_${romtype}.rom" add -f .coreboot-version -n lbversion -t raw
 
 	# Add the background image
 	if [ "$romtype" = "vesafb" ]
@@ -141,7 +140,7 @@ rm -Rf "../bin/grub/${boardtarget}/"
 mv "${boardtarget}/" "../bin/grub/"
 
 # version info file no longer needed
-rm -f "lbversion"
+rm -f ".coreboot-version"
 
 # go back to main source directory
 cd "../"
--
cgit v0.9.1