From fa8e204f144ebe318f6173d2570dd90d50dace87 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 7 Oct 2023 02:36:46 +0100 Subject: unified projectname/version/versiondate handling Signed-off-by: Leah Rowe --- script/update/project/build | 3 --- script/update/release/roms | 5 ----- script/update/release/src | 7 ------- 3 files changed, 15 deletions(-) (limited to 'script/update') diff --git a/script/update/project/build b/script/update/project/build index 81343754..98d6db9b 100755 --- a/script/update/project/build +++ b/script/update/project/build @@ -10,9 +10,6 @@ set -u -e . "include/err.sh" . "include/option.sh" -read projectname < projectname -read version < version - export LOCALVERSION="-${projectname}-${version}" eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \ diff --git a/script/update/release/roms b/script/update/release/roms index 60622315..40697ae3 100755 --- a/script/update/release/roms +++ b/script/update/release/roms @@ -7,9 +7,6 @@ set -u -e . "include/err.sh" -read projectname < projectname -version="version-unknown" -versiondate="version-date-unknown" tree="default" eval "$(setvars "" target CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ CONFIG_KBC1126_FIRMWARE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW)" @@ -31,8 +28,6 @@ main() init_check() { - [ -f version ] && read version < version - [ -f versiondate ] && read versiondate < versiondate [ ! -d "bin/" ] && \ err "init_check: no ROMs built yet (error)" [ -d "release/" ] || \ diff --git a/script/update/release/src b/script/update/release/src index 689a23ab..f8909bbf 100755 --- a/script/update/release/src +++ b/script/update/release/src @@ -7,8 +7,6 @@ set -u -e . "include/err.sh" -read projectname < projectname - trees_fetch_list="coreboot u-boot seabios" simple_fetch_list="flashrom grub memtest86plus me_cleaner uefitool" simple_fetch_list="${simple_fetch_list} bios_extract biosutilities" @@ -18,17 +16,12 @@ dirlist="config util script include" linklist="update" # symlinks in main directory, to script: lbmk filelist="build README.md COPYING version versiondate projectname .gitignore" -version="version-unknown" -versiondate="version-date-unknown" eval "$(setvars "" reldir dirname srcdir)" printf "Building source code archive, version %s\n" "${version}" main() { - [ -f version ] && read version < version - [ -f versiondate ] && read versiondate < versiondate - create_release_directory download_modules copy_files -- cgit v1.2.1