parent
82bd87fa16
commit
1f1498be74
|
@ -2,8 +2,10 @@ tree="default"
|
||||||
romtype="normal"
|
romtype="normal"
|
||||||
arch="x86_64"
|
arch="x86_64"
|
||||||
payload_grub="n"
|
payload_grub="n"
|
||||||
payload_seabios_withgrub="n"
|
payload_grub_withseabios="n"
|
||||||
payload_seabios="y"
|
payload_seabios="y"
|
||||||
payload_seabios_withgrub="y"
|
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
|
payload_seabios_withgrub="y"
|
||||||
|
payload_seabios_grubonly="y"
|
||||||
grub_scan_disk="ahci"
|
grub_scan_disk="ahci"
|
||||||
|
microcode_required="n"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{www}{
|
{www}{
|
||||||
rev: f3001eae5724ef38fe512a378148a2d619a0ff24
|
rev: 6ebb88528e342cae48ee75a6f1bfa1b71002e1c3
|
||||||
loc: www
|
loc: www
|
||||||
url: https://codeberg.org/libreboot/lbwww
|
url: https://codeberg.org/libreboot/lbwww
|
||||||
bkup_url: https://git.disroot.org/libreboot/lbwww
|
bkup_url: https://git.disroot.org/libreboot/lbwww
|
||||||
|
|
|
@ -16,7 +16,7 @@ index bd4431000..31308e16a 100644
|
||||||
grub_term_cls (term);
|
grub_term_cls (term);
|
||||||
|
|
||||||
- msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
|
- msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
|
||||||
+ msg_formatted = grub_xasprintf (_("Libreboot 20231021 release, based on coreboot. https://libreboot.org/"));
|
+ msg_formatted = grub_xasprintf (_("Libreboot 20231101 release, based on coreboot. https://libreboot.org/"));
|
||||||
if (!msg_formatted)
|
if (!msg_formatted)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,9 @@ git_am_patches()
|
||||||
for patch in "${patchdir}/"*; do
|
for patch in "${patchdir}/"*; do
|
||||||
[ -L "${patch}" ] && continue
|
[ -L "${patch}" ] && continue
|
||||||
[ -f "${patch}" ] || continue
|
[ -f "${patch}" ] || continue
|
||||||
if ! git am "${patch}"; then
|
patchfail="n"
|
||||||
|
git am "${patch}" || patchfail="y"
|
||||||
|
if [ "${patchfail}" = "y" ]; then
|
||||||
git am --abort || err "${sdir}: !git am --abort"
|
git am --abort || err "${sdir}: !git am --abort"
|
||||||
err "!git am ${patch} -> ${sdir}"
|
err "!git am ${patch} -> ${sdir}"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -95,6 +95,7 @@ build_release()
|
||||||
# now test the vendor insert script, using the release archive:
|
# now test the vendor insert script, using the release archive:
|
||||||
(
|
(
|
||||||
cd "${srcdir}" || err "!cd ${srcdir}"
|
cd "${srcdir}" || err "!cd ${srcdir}"
|
||||||
|
mkfakeroms
|
||||||
for vrom in ../roms/*.tar.xz; do
|
for vrom in ../roms/*.tar.xz; do
|
||||||
[ -f "${vrom}" ] || continue
|
[ -f "${vrom}" ] || continue
|
||||||
case "${vrom}" in
|
case "${vrom}" in
|
||||||
|
@ -129,11 +130,7 @@ fetch_trees()
|
||||||
|
|
||||||
mkrom_images()
|
mkrom_images()
|
||||||
{
|
{
|
||||||
# fake me.bin to make x201 roms build
|
mkfakeroms
|
||||||
mkdir -p "vendorfiles/cache/" || \
|
|
||||||
err "mkvdir: !mkdir -p \"vendorfiles/cache/\""
|
|
||||||
dd if=/dev/zero of="vendorfiles/cache/x201_factory.rom" \
|
|
||||||
bs=68k count=1 || err "mkvdir: can't make fake x201_factory.rom"
|
|
||||||
|
|
||||||
./build roms all || err "${_xm}: roms-all"
|
./build roms all || err "${_xm}: roms-all"
|
||||||
./build serprog rp2040 || err "${_xm}: rp2040"
|
./build serprog rp2040 || err "${_xm}: rp2040"
|
||||||
|
@ -147,6 +144,15 @@ mkrom_images()
|
||||||
mv "release/${version}/roms/" ../roms || err "${_xm}: copy roms/"
|
mv "release/${version}/roms/" ../roms || err "${_xm}: copy roms/"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mkfakeroms()
|
||||||
|
{
|
||||||
|
# fake me.bin to make x201 roms build
|
||||||
|
mkdir -p "vendorfiles/x201/" || \
|
||||||
|
err "mkvdir: !mkdir -p \"vendorfiles/x201/\""
|
||||||
|
dd if=/dev/zero of="vendorfiles/x201/me.bin" \
|
||||||
|
bs=68k count=1 || err "mkvdir: can't make fake x201 me.bin"
|
||||||
|
}
|
||||||
|
|
||||||
handle_rom_archive()
|
handle_rom_archive()
|
||||||
{
|
{
|
||||||
builddir="${1}"
|
builddir="${1}"
|
||||||
|
@ -272,7 +278,7 @@ mktarball()
|
||||||
[ "${2%/*}" = "${2}" ] || mkdir -p "${2%/*}" || err "mk, !mkdir -p \"${2%/*}\""
|
[ "${2%/*}" = "${2}" ] || mkdir -p "${2%/*}" || err "mk, !mkdir -p \"${2%/*}\""
|
||||||
if [ "${tar_implementation% *}" = "tar (GNU tar)" ]; then
|
if [ "${tar_implementation% *}" = "tar (GNU tar)" ]; then
|
||||||
tar --sort=name --owner=root:0 --group=root:0 \
|
tar --sort=name --owner=root:0 --group=root:0 \
|
||||||
--mtime="UTC 2023-10-21" -c "${1}" | xz -T0 -9e > "${2}" || \
|
--mtime="UTC 2023-11-01" -c "${1}" | xz -T0 -9e > "${2}" || \
|
||||||
err "mktarball 1, ${1}"
|
err "mktarball 1, ${1}"
|
||||||
else
|
else
|
||||||
# TODO: reproducible tarballs on non-GNU systems
|
# TODO: reproducible tarballs on non-GNU systems
|
||||||
|
|
|
@ -39,7 +39,9 @@ main()
|
||||||
|
|
||||||
check_board()
|
check_board()
|
||||||
{
|
{
|
||||||
if ! check_release "${archive}" ; then
|
failcheck="n"
|
||||||
|
check_release "${archive}" || failcheck="y"
|
||||||
|
if [ "${failcheck}" = "y" ]; then
|
||||||
[ -f "${rom}" ] || \
|
[ -f "${rom}" ] || \
|
||||||
err "check_board: \"${rom}\" is not a valid path"
|
err "check_board: \"${rom}\" is not a valid path"
|
||||||
[ -z "${rom+x}" ] && \
|
[ -z "${rom+x}" ] && \
|
||||||
|
|
Loading…
Reference in New Issue