diff options
Diffstat (limited to 'resources')
| -rwxr-xr-x | resources/scripts/helpers/build/module/coreboot | 4 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/release/roms | 7 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/release/src | 7 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/release/tobuild | 7 | ||||
| -rwxr-xr-x | resources/scripts/helpers/build/release/util | 7 |
5 files changed, 30 insertions, 2 deletions
diff --git a/resources/scripts/helpers/build/module/coreboot b/resources/scripts/helpers/build/module/coreboot index 2fee6e3c..f6e23cae 100755 --- a/resources/scripts/helpers/build/module/coreboot +++ b/resources/scripts/helpers/build/module/coreboot @@ -98,7 +98,7 @@ apply_patches_from_directory() { continue # ugly ugly ugly ugly ugly fi # most hideous thing you've ever seen - git am "${patch}" || return 1 + git am "${patch}" || continue done fi } @@ -110,7 +110,7 @@ apply_patches_from_file() { if [ -f "${patch_list}" ]; then for patchname in $(cat "${patch_list}"); do - git am "${libreboot_src_root}/${patchname}" || return 1 + git am "${libreboot_src_root}/${patchname}" || continue done fi } diff --git a/resources/scripts/helpers/build/release/roms b/resources/scripts/helpers/build/release/roms index 5ab835f2..a731d1d6 100755 --- a/resources/scripts/helpers/build/release/roms +++ b/resources/scripts/helpers/build/release/roms @@ -75,6 +75,13 @@ for payload in *; do cp "NEWS" "${archivename}/" fi + if [ -f "../../RELEASE" ]; then + rm -f "${archivename}/ChangeLog" + rm -f "${archivename}/NEWS" + cp "../../RELEASE" "${archivename}/ChangeLog" + cp "../../RELEASE" "${archivename}/NEWS" + fi + # Put the version string in the archive. printf '%s\n' "${version}" >"${archivename}/version" # Put the version date string in the archive diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src index c9a03ae6..d224fb51 100755 --- a/resources/scripts/helpers/build/release/src +++ b/resources/scripts/helpers/build/release/src @@ -65,6 +65,13 @@ else cp "NEWS" "${distdir}/" fi +if [ -f "RELEASE" ]; then + rm -f "${distdir}/ChangeLog" + rm -f "${distdir}/NEWS" + cp "RELEASE" "${distdir}/ChangeLog" + cp "RELEASE" "${distdir}/NEWS" +fi + # include version information printf '%s\n' "${version}" >"${distdir}/version" # include version date information diff --git a/resources/scripts/helpers/build/release/tobuild b/resources/scripts/helpers/build/release/tobuild index d9022f7b..b3a9fb0c 100755 --- a/resources/scripts/helpers/build/release/tobuild +++ b/resources/scripts/helpers/build/release/tobuild @@ -84,6 +84,13 @@ else cp "NEWS" "${distdir}/" fi +if [ -f "RELEASE" ]; then + rm -f "${distdir}/ChangeLog" + rm -f "${distdir}/NEWS" + cp "RELEASE" "${distdir}/ChangeLog" + cp "RELEASE" "${distdir}/NEWS" +fi + # include version information printf '%s\n' "${version}" >"${distdir}/version" # include version date information diff --git a/resources/scripts/helpers/build/release/util b/resources/scripts/helpers/build/release/util index 40fafaed..df4bd6be 100755 --- a/resources/scripts/helpers/build/release/util +++ b/resources/scripts/helpers/build/release/util @@ -76,6 +76,13 @@ else cp "NEWS" "${distdir}/" fi +if [ -f "RELEASE" ]; then + rm -f "${distdir}/ChangeLog" + rm -f "${distdir}/NEWS" + cp "RELEASE" "${distdir}/ChangeLog" + cp "RELEASE" "${distdir}/NEWS" +fi + # include version information printf '%s\n' "${version}" >"${distdir}/version" # include version date information |