diff --git a/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch b/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch index df972a582..690565763 100644 --- a/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch +++ b/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch @@ -1,7 +1,7 @@ From d7db6adbb1f9b58e86148117d5449c18232c8a43 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 28 Dec 2014 22:25:58 -0700 -Subject: [PATCH 1/8] makechrootpkg: cache dir +Subject: [PATCH 1/9] makechrootpkg: cache dir --- makechrootpkg.in | 10 ++++++++-- diff --git a/alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch b/alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch index 7f2a6a1d9..60cee1c38 100644 --- a/alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch +++ b/alarm/devtools-alarm/0002-arch-nspawn-keep-mirrorlist.patch @@ -1,7 +1,7 @@ From 849d82cd9eed1d4ad08aee9cb1c47ee0cf82c186 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 28 Dec 2014 22:27:34 -0700 -Subject: [PATCH 2/8] arch-nspawn: keep mirrorlist +Subject: [PATCH 2/9] arch-nspawn: keep mirrorlist --- arch-nspawn.in | 3 +-- diff --git a/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch b/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch index da33cd369..393830723 100644 --- a/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch +++ b/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch @@ -1,7 +1,7 @@ From 20af170ed679522bb78ffec04f9f4234209dab00 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 28 Dec 2014 22:32:15 -0700 -Subject: [PATCH 3/8] makechrootpkg: distcc +Subject: [PATCH 3/9] makechrootpkg: distcc --- makechrootpkg.in | 4 +++- diff --git a/alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch b/alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch index 726afbd12..bec052394 100644 --- a/alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch +++ b/alarm/devtools-alarm/0004-arch-nspawn-arm-fix.patch @@ -1,7 +1,7 @@ From 0e72ba89cc863b7545577c3c463a30725cfa7340 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 28 Dec 2014 22:33:00 -0700 -Subject: [PATCH 4/8] arch-nspawn: arm fix +Subject: [PATCH 4/9] arch-nspawn: arm fix --- arch-nspawn.in | 2 +- diff --git a/alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch b/alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch index 43da398af..bb6d01c62 100644 --- a/alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch +++ b/alarm/devtools-alarm/0005-makechrootpkg-no-default-logging.patch @@ -1,7 +1,7 @@ From fe9761f7d56bc921a4a9d983d73e63f820df5184 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 28 Dec 2014 22:33:41 -0700 -Subject: [PATCH 5/8] makechrootpkg: no default logging +Subject: [PATCH 5/9] makechrootpkg: no default logging --- makechrootpkg.in | 2 +- diff --git a/alarm/devtools-alarm/0006-archbuild-no-setarch.patch b/alarm/devtools-alarm/0006-archbuild-no-setarch.patch index a51494ed8..6488da90f 100644 --- a/alarm/devtools-alarm/0006-archbuild-no-setarch.patch +++ b/alarm/devtools-alarm/0006-archbuild-no-setarch.patch @@ -1,7 +1,7 @@ From 25cb666403f4c12fed5885b148237ac5a108ec04 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 28 Dec 2014 22:34:04 -0700 -Subject: [PATCH 6/8] archbuild: no setarch +Subject: [PATCH 6/9] archbuild: no setarch --- archbuild.in | 2 +- diff --git a/alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch b/alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch index f5290be09..46e9f89e5 100644 --- a/alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch +++ b/alarm/devtools-alarm/0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch @@ -1,7 +1,7 @@ From 28e5357b1c6b0851ac171249fb10f8b170faf0c3 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 3 Jul 2016 21:32:15 -0600 -Subject: [PATCH 7/8] makechrootpkg: don't delete MAKEFLAGS and PACKAGER +Subject: [PATCH 7/9] makechrootpkg: don't delete MAKEFLAGS and PACKAGER --- makechrootpkg.in | 4 +--- diff --git a/alarm/devtools-alarm/0008-makechrootpkg-gotmpdir.patch b/alarm/devtools-alarm/0008-makechrootpkg-gotmpdir.patch index 0ed6c317d..159bbbf2e 100644 --- a/alarm/devtools-alarm/0008-makechrootpkg-gotmpdir.patch +++ b/alarm/devtools-alarm/0008-makechrootpkg-gotmpdir.patch @@ -1,7 +1,7 @@ From 7ce31cb2855ca525dba932e566646f2e337930ed Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 22 Jul 2021 18:22:43 -0600 -Subject: [PATCH 8/8] makechrootpkg: gotmpdir +Subject: [PATCH 8/9] makechrootpkg: gotmpdir --- makechrootpkg.in | 2 +- diff --git a/alarm/devtools-alarm/PKGBUILD b/alarm/devtools-alarm/PKGBUILD index d4a4d9150..5d000bd51 100644 --- a/alarm/devtools-alarm/PKGBUILD +++ b/alarm/devtools-alarm/PKGBUILD @@ -3,11 +3,13 @@ # ALARM: Kevin Mihelich # - patches to fix issues with how we use the tools +# ALARM: Maxim Baz +# - add ARM-specific helpers to build in clean chroot with recommended flags pkgname=devtools-alarm _pkgname=devtools pkgver=20220621 -pkgrel=1 +pkgrel=2 pkgdesc='Tools for Arch Linux ARM package maintainers' arch=('any') license=('GPL') @@ -27,7 +29,8 @@ source=(${url}/uploads/8217baae0afcdb540bde9f5b030f05a9/devtools-${pkgver}.tar.g '0005-makechrootpkg-no-default-logging.patch' '0006-archbuild-no-setarch.patch' '0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch' - '0008-makechrootpkg-gotmpdir.patch') + '0008-makechrootpkg-gotmpdir.patch' + '0009-arm-helpers.patch') validpgpkeys=( '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC' # Pierre Schmitz '86CFFCA918CF3AF47147588051E8B148A9999C34' # Evangelos Foutras @@ -39,24 +42,26 @@ validpgpkeys=( ) sha256sums=('0938d41b4bc469e62d86d2a287612a090640f6eebde92137b8bd7727b89e95dd' 'SKIP' - '618bda0dad5337f8e1500832a5f255300802e94ada7711907dc47f2569e9f519' - 'b0e43fb242096127aba846d9f597bb31c34a5de636e4bd473a2fdf63d9a89976' - 'd6ef2ff23accb15b554cf54d75ca5a55ff67400c0852d2646a3bd5533d1ed70d' - '9d9e6949882d89dfb1cc8dc833dbb1f4bb4a0d1be50439a3ae27e78820df3763' - '1d6f17cc9c77690bdd007e276da52a6acf54b52dbe081ce6c6767a3fa1b5b113' - '2f68d22a0c04fe6a47266a9e2b68b90b092be6ab5888686609fd85b19ed8c5b3' - '3b6d1b20d5145d13c8d8b8fd4a6555034579067dcb768ea574e29bfb7101fb09' - '1162044b55ebf6cbec81da94dd1d85e48657311f03e322f3a17dc22e060b54a1') + '71ce5686b8dece2a181561dc32bb981c6b7d1a8d5e4c7884785de0db2f844cd4' + 'd835956292340e5283eb4f0f0634964b0445449a138ea9d377221aa1c8575a74' + 'ca64ec0b697f7a0359c2534559e8a5b3e6c4a7cb3020835a340238086029ee3f' + '1fdf97a84172a793c2d1c7e649d1c0e14ea3381fb91804bb4b74b3b5012c580f' + '09e7fa4a0d15a1006c962ee9e4ce5ebb0c296944ab416c18f6e19f237af8960e' + '302a65bc27341b5ca3996763936ed85ef4335e6cee696ffae8c9796a44a7465a' + '411c0f84b3cfbec4e86782c7ef8d990770a98b344fda1c5e2bc16add54e0482b' + 'e6d12573d7d66b0d64ff2975adde7ffc1b3cdf8e7851444dd2235b60ebe994ae' + '2e15998f10abe77cfe62893ebcf637f13ab1cf21ac9b51254c3fdb446fe69078') b2sums=('007f62b6cb3f06904fcafec4869a43136643bd364a7f0f314c792c08fbdafafaf8a268f8a372f78402deaa1f87bfc3f2fc7099f78742c6776d4ac49fe4884d58' 'SKIP' - '1d1a9c5ea3279dc0bae47265f5068b6fae2de63c6f81cba0a713b36b84ddb60f5e982f5e3acc21dd2316fbf9b756036091c51545f1fa1a623628e72bbe2b717d' - 'ed5c5c92caf67e13ba06dae6c73d775786eaf640fbc06cb70faf0d0f088f9c092fda2be76d767b20d96a10c670818d3bf7ebbc96467418234add7b88f308dc34' - '4406f49a909b7101e2950ae6ee0484f6e71da41396d2a6884b0df996d06fc94026624cc2e87f237b5ffb017414f6c7cd34ef881234654763c4e194c9a1460db2' - '4d8c095d07218f1f7d252e1a2cb0f01cf4c2fd856a9dfaa06006e51a32107b53e3ec0ce19606ed5f2c9888863b08330dd4ce2f95d0df8c585edcffe85dd4a094' - '8a672b6debaac19baf2189acbb72b027860bf6d16306feb8d93f48c5ef32f5d073a618a04c65ed645f47d46332b0cead282b63950b2dab0efcab23b38cc61dc8' - 'd796e4c6c8522889d803fe6ee6f52cec548e34db28bb2aeb7a62d7d3cb5e357692d83292d6b51045bc799e3f1ce985583b905b0dd9d2b22cfbdd430e6a60f5c8' - '9003b89871dcb20f36991a28a3095762191ed9101283504a3a986e38d1b9f207a5db6d7500f047ee40dea6fe17a21a56a94aba5816ad686490d7534cdf77b715' - '66b23af5326e0031657f2499ae004cf922b71623798f885d7c777fa1cf44172db2ae05d7128bb932df3f3f2a7c47b418d428687c9f149c2d0b487ec6bd68571e') + 'dd0f62be73c262002cf3fa34caea3c88709b8deb85a2bf7c658d1cd63d51eb618fc5b03a4ef420876ac77660753dc69549dead1fdcfea71728775191f2e80ed9' + 'dfc5e501f4b61229daa071184bb8846c08ac17b226f134cd26c3a90610ab3419042c5259e0762603243f424d17c97133f05d99c92784327317d50b60cbb2a24b' + 'f07da6a320c5d8adf55062f99c91c501fb36ed6bc4637a6f759958aa9504865ac69ea35508f7c9868d6d3a28622b409514d4f0e16b2b23127ff21d1304121f51' + '1d4b84f4e28d9a8081b600c461404acd1b0f2463dcff850a8720ad52678f2917a14e2cae6431dd3ce60639baa2c609943466541fa5bd45a3ef3470dbf99d7690' + '0cadc51cdc3a08474d8fabbd7c5b15502903ff07902363a18f71b81d6ed58c1a4fd7d3f2e0f0d12b0a55d4c2011352cb6a7460a3406d1e13173c34a6b3928ada' + 'f5a81fd9e2f67d7aa66c9f1365af102039a8fdd502ccd22b5570a90672c37795d0b2aa64cd1d3d09a70943f003a929c6211394f680002b164d71e33a884204fc' + 'c25c589c1f6584a08c30f875947fc5a1230c072ff5a87db0b5356a293a0ad7f374903a0a75ec92fd18549a917931cee7aff445b4f8f8dfc86309c1dfa0bdefa1' + '03b6e0b136b91ec60b9c3f22b54aa66475d4c21f047bf33db2a0703ee0f200c04f3a4ce60af1edba8292d04f3c31d5aaac1357bf644236b686f09f207535e90c' + 'c0b6b15469ac04fcd1a1e6040c013934284773508e43db8bffb5395de0c3885a76f922e6821474bbfcd0ad3df972e6558824004487ca321d11fd502636faab92') prepare() { cd "${_pkgname}-${pkgver}" @@ -68,6 +73,7 @@ prepare() { patch -p1 -i ../0006-archbuild-no-setarch.patch patch -p1 -i ../0007-makechrootpkg-don-t-delete-MAKEFLAGS-and-PACKAGER.patch patch -p1 -i ../0008-makechrootpkg-gotmpdir.patch + patch -p1 -i ../0009-arm-helpers.patch } build() {