scjudd
/
airgap
forked from public/airgap
1
0
Fork 0
Code Pull Requests Activity

bump HEADS to latest upstream from purism

This commit is contained in:
Lance Vick 2020-10-21 22:59:10 -07:00
parent cdc7d346c4
commit d408ead328
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
NAME := airgap NAME := airgap
IMAGE := local/$(NAME):latest IMAGE := local/$(NAME):latest
TARGET := x86_64 TARGET := x86_64
DEVICES := librem13v4 librem15v4 DEVICES := librem_13v4 librem_15v4
GIT_REF := $(shell git log -1 --format=%H config) GIT_REF := $(shell git log -1 --format=%H config)
GIT_AUTHOR := $(shell git log -1 --format=%an config) GIT_AUTHOR := $(shell git log -1 --format=%an config)
GIT_KEY := $(shell git log -1 --format=%GP config) GIT_KEY := $(shell git log -1 --format=%GP config)

2
config/config.env
View File

@ -1,2 +1,2 @@
BUILDROOT_REF=2766f346195dec29b53bc09f6038193998ea3693 BUILDROOT_REF=2766f346195dec29b53bc09f6038193998ea3693
HEADS_REF=648a75b32128bf839dd201b8331b42c0c33da39a HEADS_REF=e30e3bf3e540b541aa68155233ad1106c8b8631e

1
config/container/package-hashes.txt
View File

@ -107,6 +107,7 @@
5c83aafe6b83f801434c5dad7bddad8a8b459a1b590ee7d344c30667d8ca1ac5 liberror-perl_0.17027-2_all.deb 5c83aafe6b83f801434c5dad7bddad8a8b459a1b590ee7d344c30667d8ca1ac5 liberror-perl_0.17027-2_all.deb
5e06dffcea8b16766498bdcbcf703e8b7e31c2d52735fa181a5f5f95db5de7ae cmake-data_3.13.4-1_all.deb 5e06dffcea8b16766498bdcbcf703e8b7e31c2d52735fa181a5f5f95db5de7ae cmake-data_3.13.4-1_all.deb
603f929d1ae548a8faa1f892ae93e623bde97de7ddbe4a796618c735ca7ff8b8 libicu63_63.1-6+deb10u1_amd64.deb 603f929d1ae548a8faa1f892ae93e623bde97de7ddbe4a796618c735ca7ff8b8 libicu63_63.1-6+deb10u1_amd64.deb
619f27785060d2d942b23a897481bb5fc068c8bba7afc710e48dbf1ec410ad08 gawk_1%3a4.2.1+dfsg-1_amd64.deb
61c00b6f4c7a242aa6aefdc07012747607cd9c6c5392c1dcd087ce27031dd1dd perl-modules-5.28_5.28.1-6+deb10u1_all.deb 61c00b6f4c7a242aa6aefdc07012747607cd9c6c5392c1dcd087ce27031dd1dd perl-modules-5.28_5.28.1-6+deb10u1_all.deb
61c7a740651a8f310a08d83a0c90a295916479588ae91f5222e429059560990e manpages_4.16-2_all.deb 61c7a740651a8f310a08d83a0c90a295916479588ae91f5222e429059560990e manpages_4.16-2_all.deb
61fc3d4e34671d05f097e4aee5c03223b66de4fcbc76887ad1dbc55885c3965b pkg-config_0.29-6_amd64.deb 61fc3d4e34671d05f097e4aee5c03223b66de4fcbc76887ad1dbc55885c3965b pkg-config_0.29-6_amd64.deb

1
config/container/packages.list
View File

@ -28,6 +28,7 @@ file=1:5.35-4+deb10u1
flex=2.6.4-6.2 flex=2.6.4-6.2
g++-8=8.3.0-6 g++-8=8.3.0-6
g++=4:8.3.0-1 g++=4:8.3.0-1
gawk=1:4.2.1+dfsg-1
gcc-8=8.3.0-6 gcc-8=8.3.0-6
gcc=4:8.3.0-1 gcc=4:8.3.0-1
git-man=1:2.20.1-2+deb10u3 git-man=1:2.20.1-2+deb10u3

24
config/heads/patches/usb-boot.patch
View File

@ -1,5 +1,5 @@
diff --git a/initrd/bin/gui-init b/initrd/bin/gui-init diff --git a/initrd/bin/gui-init b/initrd/bin/gui-init
index a7f97ab..f1562a9 100755 index 38953ca..1740da6 100755
--- a/initrd/bin/gui-init --- a/initrd/bin/gui-init
+++ b/initrd/bin/gui-init +++ b/initrd/bin/gui-init
@@ -13,6 +13,11 @@ mount_boot() @@ -13,6 +13,11 @@ mount_boot()
@ -11,11 +11,11 @@ index a7f97ab..f1562a9 100755
+ enable_usb + enable_usb
+ fi + fi
+ +
# ensure default boot device is set # try to mount if CONFIG_BOOT_DEV exists
if [ ! -e "$CONFIG_BOOT_DEV" ]; then if [ -e "$CONFIG_BOOT_DEV" ]; then
if (whiptail $CONFIG_ERROR_BG_COLOR --clear --title "ERROR: $CONFIG_BOOT_DEV missing!" \ mount -o ro $CONFIG_BOOT_DEV /boot
diff --git a/initrd/bin/mount-usb b/initrd/bin/mount-usb diff --git a/initrd/bin/mount-usb b/initrd/bin/mount-usb
index 266f9dd..556d66e 100755 index 501171a..2196bbd 100755
--- a/initrd/bin/mount-usb --- a/initrd/bin/mount-usb
+++ b/initrd/bin/mount-usb +++ b/initrd/bin/mount-usb
@@ -4,19 +4,6 @@ @@ -4,19 +4,6 @@
@ -39,11 +39,11 @@ index 266f9dd..556d66e 100755
mkdir /media mkdir /media
fi fi
diff --git a/initrd/bin/usb-scan b/initrd/bin/usb-scan diff --git a/initrd/bin/usb-scan b/initrd/bin/usb-scan
index a9debdf..6f10a30 100755 index d9f26b0..330d672 100755
--- a/initrd/bin/usb-scan --- a/initrd/bin/usb-scan
+++ b/initrd/bin/usb-scan +++ b/initrd/bin/usb-scan
@@ -4,12 +4,6 @@ set -e -o pipefail @@ -5,12 +5,6 @@ set -e -o pipefail
. /etc/functions . /etc/gui_functions
. /tmp/config . /tmp/config
-# Unmount any previous boot device -# Unmount any previous boot device
@ -53,13 +53,13 @@ index a9debdf..6f10a30 100755
-fi -fi
- -
# Mount the USB boot device # Mount the USB boot device
if ! grep -q /media /proc/mounts ; then mount_usb || die "Unable to mount /media"
mount-usb "$CONFIG_USB_BOOT_DEV" \
diff --git a/initrd/etc/functions b/initrd/etc/functions diff --git a/initrd/etc/functions b/initrd/etc/functions
index 0c7e950..d8f4e33 100755 index dc0fbed..00afcdb 100755
--- a/initrd/etc/functions --- a/initrd/etc/functions
+++ b/initrd/etc/functions +++ b/initrd/etc/functions
@@ -116,6 +116,18 @@ enable_usb() @@ -122,6 +122,18 @@ enable_usb()
|| die "xhci_pci: module load failed" || die "xhci_pci: module load failed"
sleep 2 sleep 2
fi fi