From df06a8f87cb8162eaf9cce88b7f8f2b65c444a34 Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Fri, 10 Feb 2023 19:44:30 -0800 Subject: [PATCH] update paths for new toolchain version --- Makefile | 28 +++++++++---------- .../airgap_x86_64.iso.8E47A1EC35A1551D.asc | 16 ----------- release/1.0.0rc1/hashes.txt | 3 -- .../librem_13v4.rom.8E47A1EC35A1551D.asc | 16 ----------- .../librem_15v4.rom.8E47A1EC35A1551D.asc | 16 ----------- release/1.0.0rc2/airgap.iso | 3 -- release/1.0.0rc2/manifest.36C8AAA9.asc | 16 ----------- release/1.0.0rc2/manifest.52E0BA4D.asc | 20 ------------- release/1.0.0rc2/manifest.txt | 2 -- release/1.0.0rc2/release.env | 5 ---- src/toolchain | 2 +- 11 files changed, 15 insertions(+), 112 deletions(-) delete mode 100644 release/1.0.0rc1/airgap_x86_64.iso.8E47A1EC35A1551D.asc delete mode 100644 release/1.0.0rc1/hashes.txt delete mode 100644 release/1.0.0rc1/librem_13v4.rom.8E47A1EC35A1551D.asc delete mode 100644 release/1.0.0rc1/librem_15v4.rom.8E47A1EC35A1551D.asc delete mode 100644 release/1.0.0rc2/airgap.iso delete mode 100644 release/1.0.0rc2/manifest.36C8AAA9.asc delete mode 100644 release/1.0.0rc2/manifest.52E0BA4D.asc delete mode 100644 release/1.0.0rc2/manifest.txt delete mode 100644 release/1.0.0rc2/release.env diff --git a/Makefile b/Makefile index 80a74a7..75575df 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ include $(PWD)/src/toolchain/Makefile clean: toolchain rm -f $(OUT_DIR) $(CACHE_DIR)/buildroot-ccache || : $(call toolchain,$(USER)," \ - cd $(CACHE_DIR)/buildroot; \ + cd $(FETCH_DIR)/buildroot; \ make clean; \ ") @@ -18,17 +18,17 @@ mrproper: .PHONY: menuconfig menuconfig: toolchain $(call toolchain,$(USER)," \ - cd $(CACHE_DIR)/buildroot; \ - make "airgap_$(TARGET)_defconfig"; \ + cd $(FETCH_DIR)/buildroot; \ + make "airgap_$(TARGET)_defconfig"; \ make menuconfig; \ ") - cp $(CACHE_DIR)/buildroot/.config \ + cp $(FETCH_DIR)/buildroot/.config \ "config/buildroot/configs/airgap_$(TARGET)_defconfig" .PHONY: linux-menuconfig linux-menuconfig: toolchain $(call toolchain,$(USER),"\ - cd $(CACHE_DIR)/buildroot; \ + cd $(FETCH_DIR)/buildroot; \ make linux-menuconfig; \ make linux-update-defconfig; \ ") @@ -46,26 +46,26 @@ vm: toolchain release: | \ $(OUT_DIR)/airgap.iso \ $(OUT_DIR)/manifest.txt - mkdir -p $(RELEASE_DIR) - cp $(OUT_DIR)/release.env $(RELEASE_DIR)/release.env - cp $(OUT_DIR)/airgap.iso $(RELEASE_DIR)/airgap.iso - cp $(OUT_DIR)/manifest.txt $(RELEASE_DIR)/manifest.txt + mkdir -p $(DIST_DIR) + cp $(OUT_DIR)/release.env $(DIST_DIR)/release.env + cp $(OUT_DIR)/airgap.iso $(DIST_DIR)/airgap.iso + cp $(OUT_DIR)/manifest.txt $(DIST_DIR)/manifest.txt -$(CACHE_DIR)/buildroot: toolchain +$(FETCH_DIR)/buildroot: toolchain $(call git_clone,buildroot,$(BUILDROOT_REPO),$(BUILDROOT_REF)) $(OUT_DIR)/airgap.iso: \ toolchain \ - $(CACHE_DIR)/buildroot \ + $(FETCH_DIR)/buildroot \ $(OUT_DIR)/release.env - $(call apply_patches,$(CACHE_DIR)/buildroot,$(BR2_EXTERNAL)/patches) + $(call apply_patches,$(FETCH_DIR)/buildroot,$(BR2_EXTERNAL)/patches) $(call toolchain,$(USER)," \ - cd $(CACHE_DIR)/buildroot; \ + cd $(FETCH_DIR)/buildroot; \ make "airgap_$(TARGET)_defconfig"; \ unset FAKETIME; \ make source; \ make; \ ") mkdir -p $(OUT_DIR) - cp $(CACHE_DIR)/buildroot/output/images/rootfs.iso9660 \ + cp $(FETCH_DIR)/buildroot/output/images/rootfs.iso9660 \ $(OUT_DIR)/airgap.iso diff --git a/release/1.0.0rc1/airgap_x86_64.iso.8E47A1EC35A1551D.asc b/release/1.0.0rc1/airgap_x86_64.iso.8E47A1EC35A1551D.asc deleted file mode 100644 index 583fe4f..0000000 --- a/release/1.0.0rc1/airgap_x86_64.iso.8E47A1EC35A1551D.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEZ1U/vaRrtxq9LgsLjkeh7DWhVR0FAl/aVp8ACgkQjkeh7DWh -VR3c0RAAs72Ahb7gKmbkCrbyMyZwyaiWsScvOJlwjWCUIeyusStmmcEq7DVJnxJB -t3W13qj3PVYDLwzlYROvNag/nA8TlhLZNBsiXfv2bzwgTer1TTYWXlynvPO6XdX4 -5cqfCNDCjE88gWVhNh4A4guej7s41uYhH+gjxBgqADypMfxEpyZ/BdN+NCScWkNH -UppMf7v4ZbdkJ9IHt199je2oUp5VxH+TnSIXrXtPZHs+GdYnuxMJJjcC0wlyKd8B -25OxBVwYhDUZvDPDK6tPjMKoLIM4OhMZ9uQt4SrcxasjEk5hx3wMqYiPLdY5Moqm -vASnZcsh029xwxfwoeGU7+FOuBOMhiRlislJnSpS18PYh6m7JSZM3ZkhVsM/qis/ -e6EVVpX4BFQ/lfsKjPcVvQeOmYOiiSqIpi/FT0vrDy2uM8cbpMH/E5As4iCQjdqX -OHJF4v2M82/sd/TI3YEg7ObrkJhR1QDMVNudIqF0dfsXrdBB0nlSvJlLBJy3Je/U -DsyeQS6WUs6dlO1RGnPDw8AyR3Jpe6U3YcUzt1QS62ZY7+cXnQTuKlTJXd6nC2Sa -Yf2o7T5ZjuHaXz4uDVjDGn1gmJ0MJ2eEjDHhPdPbzP5EUTwvEiX3RinyZNJodDHq -ifqhR1EjhfaBsCa3cvGW3zV2+plU7b4HU3BLRmoPzP2UJXni2oI= -=D0VB ------END PGP SIGNATURE----- diff --git a/release/1.0.0rc1/hashes.txt b/release/1.0.0rc1/hashes.txt deleted file mode 100644 index 91fc633..0000000 --- a/release/1.0.0rc1/hashes.txt +++ /dev/null @@ -1,3 +0,0 @@ -ee666b4791d5e11c8098c29eb988cd20fcc6212f53e9b9cd74c2a93ede397b61 *release/1.0.0rc1/librem_13v4.rom -ca0d39f7e1fe4986514bfa769e7c1fbecf40c04367d6e1bc7b788a0ef27cf030 *release/1.0.0rc1/librem_15v4.rom -0891f562b6a4057ced4eb77ba69dbc2471dfc2fb73a3a07147fc0bf4501736da *release/1.0.0rc1/airgap_x86_64.iso diff --git a/release/1.0.0rc1/librem_13v4.rom.8E47A1EC35A1551D.asc b/release/1.0.0rc1/librem_13v4.rom.8E47A1EC35A1551D.asc deleted file mode 100644 index 8121bc9..0000000 --- a/release/1.0.0rc1/librem_13v4.rom.8E47A1EC35A1551D.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEZ1U/vaRrtxq9LgsLjkeh7DWhVR0FAl/aVpgACgkQjkeh7DWh -VR2MehAAnD2paKIz9dUEkQsW++8tV/lf88ojrpbAe+7hkfYB0RtIKlWpgrzoaz6o -ibs+idBVld2zY2xLn1TgHUgwNzct7DLPtl0CfGmIOxxod8Lz6aP1U9T9/DqvjANr -uT5gmdbl8AwCPwin4oZtgXuJiNQpi7+/kwzqJE8qfIJ+XxwsQ1hqctXrZzECR0jT -VklrBbRKK4M9OP1TaNQ4KbHQCtbnhWT8X5L/ejeHKctZd1gS6TsjSmGGXLTgmomp -fn4KuJmBtxRs+nmn8eIvOl24YW7SFFr1Sh99RsT3iSsVKG6HtIBmsCaZ1985mj0H -NfgvcNjoGfsfOer0mYdUM4n1SGkK2H8kGturelnWifvXzAdekpIyvn40j6kwzAsC -G5BtJTG/4PLt8h5TuTW9PiWhViqqNJE6KktujkVZmy1vTa2fqnM5oWeYVRMkok+l -jKwFghjjP8kzNTt0Yvki04wpS9ZRax6/ozDE8AK3Qw1d4oYmUouKeGbzmBZ9jVmW -cLc+PS05JA/ISIOI3LLQ6ZeqdTc0psk/zo6trWq6E6J/W094FpFDUG0hp9F4FEB8 -Efzdya9/tULyNOTx0Uc5jWegtJhcSikI97Cp9//K1u12gUB+Zs78usHSJaW/1Cxk -65dkgkztMLotiqnd+/EGqxAdAPIqkC5ft+kcGJrva7zhHNqGg58= -=Ny+p ------END PGP SIGNATURE----- diff --git a/release/1.0.0rc1/librem_15v4.rom.8E47A1EC35A1551D.asc b/release/1.0.0rc1/librem_15v4.rom.8E47A1EC35A1551D.asc deleted file mode 100644 index 6a4841f..0000000 --- a/release/1.0.0rc1/librem_15v4.rom.8E47A1EC35A1551D.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEZ1U/vaRrtxq9LgsLjkeh7DWhVR0FAl/aVpsACgkQjkeh7DWh -VR0CXA//Y5JAGaSV4FDhMTCjaEqnLnyBnRJvuAuxhP4JwpGOc54wtvtmwndSA/Wx -sVxk/Z8WYH4RmQR36xgVnzJEksCWFJ7uSj2hM57uTyNexWteDUp3JMgYw96zoiOa -9Csc9xFMN82FPYj38lY+wvCsiIPQpT7yIsZUKdrN61U5w2n9hSPvCUTLtloyOSQ+ -v/nFGOoBRVnZDXNtj0SlN0+jHhFyF4yrD3Zvbogw5e2KPwCV7i4sEMfdTEZDpDY6 -3cZGX1ZXCGxS/Tg3DpZihP4C7wWw4bhQ1ppXMmTvSDfjWPcFWD8/PFgL5jtXc6vF -ZjPJALT4D2gfCS4/FIUSvt5+6F5LicYemT49wa3XauiFsdHOou1238+9uTLL/fwX -AR6iGEA7M0VgJz95gLQG9xbw7vm/O6LnPvJREmcYMDSVHvdIea00MRHL/r+GfThF -1Z+akTbRMHipWpmXiQ3H7N8H+8cTOEro/uf0uBpIcO2e4tEdLlUkvcOjNzXKAQ2r -og5oJ4kgVV2+rp/Ow2iX+kLcE2tFO2V96J0PAZpJm5AiYqb+8DjJbFMQCQi8xzyC -ijK8WPzJNOF1uGa60EorXjQivwUiaEmVDgJrGrKdcB1/XSFTbyaVAbA/u1ecAmze -4OJLLIq8A85sRg4ZtkVYVOJ0QHfqLtTKfvVklFRCQXAiBXl0nM4= -=2Vf2 ------END PGP SIGNATURE----- diff --git a/release/1.0.0rc2/airgap.iso b/release/1.0.0rc2/airgap.iso deleted file mode 100644 index a95b67c..0000000 --- a/release/1.0.0rc2/airgap.iso +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9327a57aca4921050c8f833c3a130eb1a5a73a227be7fdd97d1774ae0d75e55 -size 121632768 diff --git a/release/1.0.0rc2/manifest.36C8AAA9.asc b/release/1.0.0rc2/manifest.36C8AAA9.asc deleted file mode 100644 index 03799a1..0000000 --- a/release/1.0.0rc2/manifest.36C8AAA9.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEZ1U/vaRrtxq9LgsLjkeh7DWhVR0FAmOpZ40ACgkQjkeh7DWh -VR01ohAAg2wScFTBDOg1ZcIN8IFnYaTUl4ibUY8+FOVz1cOe5Z/op70oCxkVqUaW -yPaQ6nEayKeoflz/tzXyPi2zIqOBL7sxyb7L59p1GZ6b/6HRv5SCnvkvw7hBUSRI -LaAypeAlGDGVaPKEAxjq80o8jJxH5yfnbX1stg6t0jTLV9Gm75cxMyRevuO0nSmW -l+ZlzTLu8aDCME2baFTRyG/FZp96cPk7SoJSBUBbnJxDAuZ9maa4lcOn5B58r52h -3ku9TNGay8WADGdkDo0QcD2Z9GGJ+rX2vFn3nUPgPdN3xOyX/OEat0agfqbN4X1U -beFeMWgx5HRwlKzraqVlwwduwqMhW74AaX7aCXXDHXtIUH2DUF2nuY5iClZJyNZ9 -7ya0AyssKtdwGT6eivFoBUUO+T+sNmSg9bC5e+iwHIYLtuwVi7zL3b2nGKzHQrtw -FaWrBjl8sa/SEop3tf4gjIoon5DuNOBzjp2yzpyb2ZiPnmGtGPr8+Pn46Q63g43z -L/qqKppon016enqFHfPRpTuSZJq6sdQHmX9WzmFsCvGXaaHxT0r3UHVqP4uHrlYG -BHOLjwE9Atn5wO+75+I40xaUe/SIiXQdQmyGLGVbwtTTp9g4PJF/Z0kFip/N4bPa -xr77dsZbYeuZ9bG8OT9GSgKq9sS4al3CamTnnyhBr95qSCCQbmo= -=8Knb ------END PGP SIGNATURE----- diff --git a/release/1.0.0rc2/manifest.52E0BA4D.asc b/release/1.0.0rc2/manifest.52E0BA4D.asc deleted file mode 100644 index b440874..0000000 --- a/release/1.0.0rc2/manifest.52E0BA4D.asc +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP MESSAGE----- - -owEB9AIL/ZANAwAKAUSobP8f3w6FAaytYgxtYW5pZmVzdC50eHRjs4VEYjg4NDcz -MGI4M2NhNGM1ZmU4NzEwNWQwNTQ0OGZjZmEwNzhmNGZlZmIyNTZlZGRkNWQ2ZjA1 -ZmYwMWM0MGUwNCAqcmVsZWFzZS5lbnYKYTkzMjdhNTdhY2E0OTIxMDUwYzhmODMz -YzNhMTMwZWIxYTVhNzNhMjI3YmU3ZmRkOTdkMTc3NGFlMGQ3NWU1NSAqYWlyZ2Fw -LmlzbwqJAjMEAAEKAB0WIQThBngeAHq5HJidszJEqGz/H98OhQUCY7OFRAAKCRBE -qGz/H98OhVjsD/4kIbP+2vOQ1ohJ9YM+YOzybPKZQZAFYGcZ+IyJ6BdKd2rhKKqo -s7N2gOvaUdmlGGVTxFcYeJq7QmYJYilQLukvn3m5KPpQLiHW8lJ3KCWi2mBXE87T -A6KNlte9f+PLEkXA+fwbY/INRlXhQthw+leE2jkCSmN6CuC6AnGWtyTidEMw6XFd -CrRNUPCexKvUTGOQHnDrikAExCXpxzeMqA0XdfXXIepMv+RBB5lMKlIwJaYD2Mlk -5mKMS931Gid16Fe7CYMAvww4OBqp81u1PAEbau0kmVze7m6GWiWOJDcMNds18Wbj -kvR/lNANwzw36yUZAghQMFWTMz2Go9pzpuwSD12sOda+2mX6iP4hvdiazPzCweBe -W7e+3de8e2bo1PZgFX1hSX09p645wg34CDfFzrTUdDB0ICysh1LJv8WULXFzVp1j -8BRgKIC8XqnYr5kdCGxefEF4rWUwqrWN4MXaSkicjw6vrPRk+qPOcyJMDqMG7f6g -UvaIXMnhQ3rSpOVWfBr4A567mB9pyVyMohRLBO+FPDVAGHkqnQcp9CcjIvrzxr8N -T5IwVopdthfSUO9JZahxSn3FpFL4M/Lb20snv/zMT3vVQlxPCQNWrOLrAbGMaKE8 -ZMDCyZOTEoYMZ4qxLsRmVNrmYMHi74dkecApZEfvF/Ra32l47S3cg4Wv1A== -=0Vmw ------END PGP MESSAGE----- diff --git a/release/1.0.0rc2/manifest.txt b/release/1.0.0rc2/manifest.txt deleted file mode 100644 index caef858..0000000 --- a/release/1.0.0rc2/manifest.txt +++ /dev/null @@ -1,2 +0,0 @@ -b884730b83ca4c5fe87105d05448fcfa078f4fefb256eddd5d6f05ff01c40e04 *release.env -a9327a57aca4921050c8f833c3a130eb1a5a73a227be7fdd97d1774ae0d75e55 *airgap.iso diff --git a/release/1.0.0rc2/release.env b/release/1.0.0rc2/release.env deleted file mode 100644 index 1b52bb2..0000000 --- a/release/1.0.0rc2/release.env +++ /dev/null @@ -1,5 +0,0 @@ -VERSION=1.0.0rc2 -GIT_REF=a9f79a459778380b6828824b46384b4c58cf0762 -GIT_AUTHOR=Lance R. Vick -GIT_KEY=6B61ECD76088748C70590D55E90A401336C8AAA9 -GIT_DATETIME=2022-12-24 15:56:16 diff --git a/src/toolchain b/src/toolchain index 99c9bd4..4a4d61f 160000 --- a/src/toolchain +++ b/src/toolchain @@ -1 +1 @@ -Subproject commit 99c9bd4f79956790b7bc08e86c325e738eee9e70 +Subproject commit 4a4d61f1b7f126310e618b1fb5fe3ae9aad7f592