From d0d77f2d072f0aa57569bbb9ac9c1bd6d94c5834 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Dec 23 2023 05:43:20 +0000 Subject: [PATCH 1/73] libre/iceweasel: 121.0.parabola1 Usual updates according to upstream changes. search-config-v2.json needs to be patched later, it seems to be unused currently. So just skip it in patch-json-files.py for now. --- diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch index b13653a..770b1f8 100644 --- a/libre/iceweasel/9002-FSDG-preference-defaults.patch +++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch @@ -18,7 +18,6 @@ possible while keeping the SW stack 100% free, release builds don't have any valid geolocation provider, so let's disable geolocation API by default for now. --- - modules/libpref/init/StaticPrefList.yaml | 2 +- modules/libpref/init/all.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) @@ -36,18 +35,18 @@ index 5632486c69..b977858e04 100644 # Time, in milliseconds, to wait for the location provider to spin up. diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index a366fdaeb8..c9d67004a2 100644 +index af04cba691..514f750a23 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3125,7 +3125,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3094,7 +3094,7 @@ pref("network.psl.onUpdate_notify", false); + // All the Geolocation preferences are here. // - #ifndef EARLY_BETA_OR_EARLIER -- pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%"); -+ pref("geo.provider.network.url", ""); - #else - // Use MLS on Nightly and early Beta. - pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); +-pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%"); ++pref("geo.provider.network.url", ""); + + // Timeout to wait before sending the location request. + pref("geo.provider.network.timeToWaitBeforeSending", 5000); -- 2.41.0 @@ -183,25 +182,25 @@ index c1983abc2b..35c24e5d43 100644 // Don't let XPIProvider install distribution add-ons; we do our own thing on mobile pref("extensions.installDistroAddons", false); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index c9d67004a2..e14f539172 100644 +index 514f750a23..abbf229223 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -1851,11 +1851,11 @@ pref("services.settings.poll_interval", 86400); // 24H - // other channels always report events. - pref("services.common.uptake.sampleRate", 1); // 1% - --pref("extensions.abuseReport.enabled", true); -+pref("extensions.abuseReport.enabled", false); - // Allow AMO to handoff reports to the Firefox integrated dialog. - pref("extensions.abuseReport.amWebAPI.enabled", true); +@@ -1851,11 +1851,11 @@ pref("services.common.uptake.sampleRate", 1); // 1% + pref("extensions.abuseReport.enabled", false); + // Whether abuse report originated from AMO should use the Firefox integrated dialog. + pref("extensions.abuseReport.amWebAPI.enabled", false); -pref("extensions.abuseReport.url", "https://services.addons.mozilla.org/api/v4/abuse/report/addon/"); -pref("extensions.abuseReport.amoDetailsURL", "https://services.addons.mozilla.org/api/v4/addons/addon/"); +pref("extensions.abuseReport.url", ""); +pref("extensions.abuseReport.amoDetailsURL", ""); + // Whether Firefox integrated abuse reporting feature should be opening the new abuse report form hosted on AMO. + pref("extensions.abuseReport.amoFormEnabled", false); +-pref("extensions.abuseReport.amoFormURL", "https://addons.mozilla.org/%LOCALE%/%APP%/feedback/addon/%addonID%/"); ++pref("extensions.abuseReport.amoFormURL", ""); // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -3193,7 +3193,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); +@@ -3158,7 +3158,7 @@ pref("extensions.webextensions.ExtensionStorageIDB.enabled", true); // Whether to allow the inline options browser in HTML about:addons page. pref("extensions.htmlaboutaddons.inline-options.enabled", true); // Show recommendations on the extension and theme list views. @@ -210,6 +209,23 @@ index c9d67004a2..e14f539172 100644 // The URL for the privacy policy related to recommended add-ons. pref("extensions.recommendations.privacyPolicyUrl", ""); +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index 1f1b1cbd3e..7ea9d82cdf 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -22,9 +22,9 @@ + pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindowMac.xhtml"); + + // Set add-ons abuse report related prefs specific to Firefox Desktop. +-pref("extensions.abuseReport.enabled", true); +-pref("extensions.abuseReport.amWebAPI.enabled", true); +-pref("extensions.abuseReport.amoFormEnabled", true); ++pref("extensions.abuseReport.enabled", false); ++pref("extensions.abuseReport.amWebAPI.enabled", false); ++pref("extensions.abuseReport.amoFormEnabled", false); + + // Enables some extra Extension System Logging (can reduce performance) + pref("extensions.logging.enabled", false); -- 2.41.0 @@ -248,7 +264,7 @@ index 9c2562ff23..7577fbe008 100644 // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.jsm for values to use here. -@@ -1518,8 +1518,8 @@ pref("prompts.defaultModalType", 3); +@@ -1603,8 +1603,8 @@ pref("prompts.defaultModalType", 3); pref("browser.topsites.useRemoteSetting", true); // Fetch sponsored Top Sites from Mozilla Tiles Service (Contile) @@ -258,7 +274,7 @@ index 9c2562ff23..7577fbe008 100644 +pref("browser.topsites.contile.endpoint", ""); // Whether to enable the Share-of-Voice feature for Sponsored Topsites via Contile. - #if defined(EARLY_BETA_OR_EARLIER) + pref("browser.topsites.contile.sov.enabled", true); -- 2.41.0 diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 3da81af..575bc74 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,7 +70,7 @@ pkgname=iceweasel epoch=1 -pkgver=120.0.1 +pkgver=121.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=120.0 @@ -85,7 +85,7 @@ license=( MPL ) depends=( - dbus-glib + dbus ffmpeg gtk3 libpulse @@ -181,17 +181,17 @@ validpgpkeys+=( '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger ) -sha256sums=('76e7bb2a144880158444d8e9014f4d080d219bd150c3db405b27e4c7e3959ae2' +sha256sums=('edc7a5159d23ff2a23e22bf5abe22231658cee2902b93b5889ee73958aa06aa4' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') # $pkgname.desktop # identity-icons-brand.svg sha256sums+=('a5eed3c1f31a253f90b0284e0caf17bd35b3fa35197cfc403cb1bd987ecd56eb' # *.branding.tar.xz 'SKIP' '4ff07eff69343e50357c9bb571dfa6a702efb3a7915ce8ca8dcb42ee18446aac' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - '77ce3e4de9b4bb280a6766cea61b0fbd81f0f946aa115bfe7bf24eca370e1d17' # 9002-FSDG-preference-defaults.patch + '3e3c5c0a9751e4728a7c7f009a1eb90565de4ebe1b938b74b6669b28168bf335' # 9002-FSDG-preference-defaults.patch '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62' # 9003-FSDG-urihandlers.patch 'f999ddb5a2cde87217bb5b0ebf20b4e0aabe88657a73545c9487cddde1deab22' # 9004-FSDG-misc.patch - '00cb44a91b42942f17258ad165810866ff123777b667a5691ea0745ba72f4332' # process-json-files.py + '5f3a646d90a075458b4cb27c19ddbd50ae7717f4e3371c9e2e4de1a8e718553e' # process-json-files.py '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06' # vendor.js.in '3803336b109ab3663d227d6d16f712c33f5c55712028ee74e6e82f2ef74bf55f') # zstandard-0.22.0.diff sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1c0' # avoid-libxul-OOM-python-check.patch @@ -199,17 +199,17 @@ sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch -b2sums=('66ac2f1071ad8276b61946465db6d71cbe0a43c154fb57db67670e8f88183893fe7c7c8284388242964fd2883e50f40f29c879ebec3a2d759d20c356f27ca151' +b2sums=('80905caeb208ef5dce7b62e248c86598ca786eb7032e114ad5d10812623bfceb688832f646dfbe220ef2fcecacf11cefae2afb0f1cdc0f7952647b71c58c9602' 'SKIP' 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635') # $pkgname.desktop # identity-icons-brand.svg b2sums+=('d6ccdc46fce7cfc4bb35a6b09deee8cd96b9076c599c1f031b4d2c5a9c2722bdf98dd14eddde50422e9a1b88f24d425c8a5f1e861877a367c6ff5365e61258c0' # *.branding.tar.xz 'SKIP' '9834f69d69f9ce3cee872a7e75b6848d5539b94752aa50c74612177a740319a33b02734f1d2cdde31ee50efa7a3ed85cf85efb7e6687cfe6ab7be843b4089e7b' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - '702f3179595ce27660e9761811369158a8102c94e77ccb28d3a58026641b055e53f9ec45a1272346eada54021d02956360e1267728fbec201c50fee42c7d677f' # 9002-FSDG-preference-defaults.patch + 'c11cb32b7959a47e6d52b45a1611d27c04129eefcb015f8f9b005c9b29a2ee216e4a4702386b159867ed121705768f0a1721e01f5cab03a5444cdf09a9ef053b' # 9002-FSDG-preference-defaults.patch 'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch '7d7c9a67ef8035f85482b37d0b7b7743f005d5e7f48d1865f21745ebd10053ed8a6c15e1e176f42d5ef738e7bb074bdad8e912983ca4614a2aab50b95824a4a6' # 9004-FSDG-misc.patch - '085c4631ec8cfdf5842068d882185c783e976b1fde74167bb71ef4d7db8c70c12844177b17e76f858ba3ce2a402848ac8fc19910dcbefd29887abfaf5faac5e4' # process-json-files.py + '6224eb8db58c0d00353512d5bf420a16be90a86dc86c9a8d735026a7f77ca4a8a148fea38015fc9639254b9e02b17d01521ad6b233a890aa082fb8476992fa2f' # process-json-files.py 'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9' # vendor.js.in '6176a2e4b7a651b50b1ca2d6c8b62b1fd7557cacff50f38cb87f126590d9a2ac8d9b249c1671be0551cc81ce9a028a22e9b29ac121e480dab61cd7c10b891d50') # zstandard-0.22.0.diff b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf0de776981cdcce2438c7add2d692f4afbc85255949558852bdec9800c59882' # avoid-libxul-OOM-python-check.patch diff --git a/libre/iceweasel/process-json-files.py b/libre/iceweasel/process-json-files.py index a2fd0e9..57e54d4 100644 --- a/libre/iceweasel/process-json-files.py +++ b/libre/iceweasel/process-json-files.py @@ -136,7 +136,7 @@ class Changes(RemoteSettings): changes = [] for collection in unwrapped_jsons: - if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json': + if collection.path not in (RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json', RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/search-config-v2.json'): latest_change = {} latest_change[cls._LAST_MODIFIED_KEY_NAME] = cls.get_collection_timestamp( collection) From 3462cdb21b49e57e61d94d2ad1fafe94831711f8 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Dec 23 2023 05:43:34 +0000 Subject: [PATCH 2/73] [gstreamer]: upgrade to v1.22.8 --- diff --git a/libre/gstreamer/0001-HACK-meson-Disable-broken-tests.patch b/libre/gstreamer/0001-HACK-meson-Disable-broken-tests.patch index e79eb30..c9dfddf 100644 --- a/libre/gstreamer/0001-HACK-meson-Disable-broken-tests.patch +++ b/libre/gstreamer/0001-HACK-meson-Disable-broken-tests.patch @@ -4,15 +4,16 @@ Date: Mon, 6 Jun 2022 00:30:08 +0200 Subject: [PATCH] HACK: meson: Disable broken tests --- - subprojects/gst-editing-services/meson.build | 1 - - subprojects/gst-plugins-good/tests/check/elements/flvmux.c | 1 - - subprojects/gst-python/meson.build | 1 - - subprojects/gst-rtsp-server/tests/check/meson.build | 1 - - subprojects/gstreamer-vaapi/meson.build | 1 - - 5 files changed, 5 deletions(-) + subprojects/gst-editing-services/meson.build | 1 - + subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c | 1 - + subprojects/gst-plugins-good/tests/check/elements/flvmux.c | 1 - + subprojects/gst-python/meson.build | 1 - + subprojects/gst-rtsp-server/tests/check/meson.build | 1 - + subprojects/gstreamer-vaapi/meson.build | 1 - + 6 files changed, 6 deletions(-) diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build -index 0d41498ddbeb..fc8a635a9bb7 100644 +index fc4f3cc45fa0..526f17b56882 100644 --- a/subprojects/gst-editing-services/meson.build +++ b/subprojects/gst-editing-services/meson.build @@ -270,7 +270,6 @@ subdir('ges') @@ -23,6 +24,18 @@ index 0d41498ddbeb..fc8a635a9bb7 100644 if not get_option('examples').disabled() subdir('examples') endif +diff --git a/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c b/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c +index 1d347b0a54ea..1ee4babf36ae 100644 +--- a/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c ++++ b/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c +@@ -6659,7 +6659,6 @@ dash_suite (void) + tcase_add_test (tc_simpleMPD, dash_mpdparser_default_presentation_delay); + + /* tests checking xlink attributes */ +- tcase_add_test (tc_simpleMPD, dash_mpdparser_xlink_period); + + /* tests checking the MPD management + * (eg. setting active streams, obtaining attributes values) diff --git a/subprojects/gst-plugins-good/tests/check/elements/flvmux.c b/subprojects/gst-plugins-good/tests/check/elements/flvmux.c index 53a8e634e41a..f270c1d11bfb 100644 --- a/subprojects/gst-plugins-good/tests/check/elements/flvmux.c @@ -36,7 +49,7 @@ index 53a8e634e41a..f270c1d11bfb 100644 tcase_add_test (tc_chain, test_video_caps_change_streamable); tcase_add_test (tc_chain, test_audio_caps_change_streamable_single); diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build -index a9bd36afe7cc..235cfb162a49 100644 +index 789821395534..86f40eea4b43 100644 --- a/subprojects/gst-python/meson.build +++ b/subprojects/gst-python/meson.build @@ -107,5 +107,4 @@ if not get_option('plugin').disabled() @@ -58,7 +71,7 @@ index 229af32f8117..b9372c125d77 100644 'gst/sessionpool', 'gst/stream', diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build -index d6176f64b67e..e036fb966234 100644 +index 2849f893feda..0279be6f90ab 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -219,7 +219,6 @@ plugins = [] diff --git a/libre/gstreamer/PKGBUILD b/libre/gstreamer/PKGBUILD index ca43739..a0c4b60 100644 --- a/libre/gstreamer/PKGBUILD +++ b/libre/gstreamer/PKGBUILD @@ -46,18 +46,15 @@ pkgname=( gst-plugin-wpe ) pkgname=( ${pkgname[*]/gst-plugin-opencv/} ) # FIXME: 'opencv' package FTBS -pkgver=1.22.7 +pkgver=1.22.8 pkgrel=1 -_pkgver_armv7h=${pkgver} -_pkgrel_armv7h=${pkgrel} _pkgver_i686=1.20.5 # NOTE: v1.20.5 fails to compile for i686 - after this moves ahead, _pkgrel_i686=3.0 # try to remove the LOCs with comment: "# n/a in v1.20.5" -_prev_ver=1.22.6 # current version of 'gst-plugins-bad' in parabola repos (x86_64) -_prev_ver_armv7h=${_prev_ver} # current version of 'gst-plugins-bad' in parabola repos (armv7h) -_prev_ver_i686=1.16.2 # current version of 'gst-plugins-bad' in parabola repos (i686) -eval "[[ -v _pkgver_${CARCH} ]] && pkgver=\$_pkgver_${CARCH}" # our different arches do not -eval "[[ -v _pkgrel_${CARCH} ]] && pkgrel=\$_pkgrel_${CARCH}" # always roll at the same speed -eval "[[ -v _prev_ver_${CARCH} ]] && _prev_ver=\$_prev_ver_${CARCH}" # self-dep +_prev_ver=1.22.7 # current version of 'gst-plugins-bad' in parabola repos (x86_64) +_prev_ver_i686=1.16.2 # current version of 'gst-plugins-bad' in parabola repos (i686) +eval "[[ -v _pkgver_${CARCH} ]] && pkgver=\$_pkgver_${CARCH}" # our different arches do not +eval "[[ -v _pkgrel_${CARCH} ]] && pkgrel=\$_pkgrel_${CARCH}" # always roll at the same speed +eval "[[ -v _prev_ver_${CARCH} ]] && _prev_ver=\$_prev_ver_${CARCH}" # nor at the same granularity pkgrel+=.parabola1 pkgdesc="Multimedia graph framework" url="https://gstreamer.freedesktop.org/" @@ -104,20 +101,24 @@ makedepends=( # gst-python # # DIFF: none are needed ) -makedepends=( ${makedepends[*]/faac/} ) # non-free -[[ "${CARCH}" == x86_64 ]] || makedepends=( ${makedepends[*]/svt-hevc/} ) # x86_64 only +makedepends=( ${makedepends[*]/faac/} ) # non-free +makedepends=( ${makedepends[*]/git/} ) # use source-ball, not VCS +makedepends=( ${makedepends[*]/$([[ "${CARCH}" == x86_64 ]] || echo svt-hevc)/} ) # x86_64 only checkdepends=(xorg-server-xvfb) source=( - # "git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=$pkgver" # DIFF: use source-ball not VCS - https://gitlab.freedesktop.org/gstreamer/gstreamer/-/archive/${pkgver}/gstreamer-${pkgver}.tar.gz # DIFF: use source-ball not VCS - # "https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-$pkgver.tar.xz"{,.asc} # DIFF: n/a + "git+https://gitlab.freedesktop.org/gstreamer/gstreamer.git?signed#tag=$pkgver" + "https://gstreamer.freedesktop.org/src/gstreamer-docs/gstreamer-docs-$pkgver.tar.xz"{,.asc} 0001-HACK-meson-Disable-broken-tests.patch ) -b2sums=('29e59a1ff67f9a99214ac25e6578ab969f122195236f96da682a7c493d9a400bb50d5aca348caed10d581ec30ce183f9c32cb0aa6c7d407d7f7b8d624a813b90' +_srcball_url=https://gitlab.freedesktop.org/gstreamer/gstreamer/-/archive/${pkgver}/gstreamer-${pkgver}.tar.gz +source=( ${source[*]/git+*/$_srcball_url} ) # use source-ball, not VCS +source=( ${source[*]/*gstreamer-docs*/} ) # 'gstreamer-docs' n/a +b2sums=('SKIP' # 'gstreamer-docs' n/a # 'gstreamer-docs' n/a - '3e59a5ae821b83ad20f5e39e52195aa6932d5877538ef63aef7205988482e2667d6d43fc7bce2b5eaaf2c280cd4369f63a0d0d9ae39094ee70ec4ecd318a64b5') -_b2sum_i686=('518a025591e2d03296197dd4b6d30dbdd1a4c2b1d435df62cf451f13c1233c7fc1ad877344765c7b5c863e4886b7df750096fdb8835151cccf9618590801f1ea') + '1887212e956a617130469c6afbd387a555d388dc36b467505b3e5248d0e6a273886fd0500d0977b714075604c61fe149a77ea05ce785cfe27e3eae0999eecb3f') +_b2sum=29e59a1ff67f9a99214ac25e6578ab969f122195236f96da682a7c493d9a400bb50d5aca348caed10d581ec30ce183f9c32cb0aa6c7d407d7f7b8d624a813b90 # upstream source-ball +_b2sum_i686=518a025591e2d03296197dd4b6d30dbdd1a4c2b1d435df62cf451f13c1233c7fc1ad877344765c7b5c863e4886b7df750096fdb8835151cccf9618590801f1ea # upstream source-ball eval "[[ -v _b2sum_${CARCH} ]] && b2sums[0]=\$_b2sum_${CARCH}" # upstream source-ball validpgpkeys=( D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller @@ -139,7 +140,7 @@ makedepends+=( libdc1394 ) # ERROR: Dependency "libdc1394-2" not found, tried pk # mksource() { # TODO: delete unused sources - the allsource packages are 650MB # or - # TODO: blacklist (reason: 'technical') and compile all split-packages, + # TODO: blacklist all split-packages (reason: 'technical') and re-package all, # simplifying the diff against the upstreams # } @@ -147,17 +148,11 @@ prepare() { ln -s gstreamer{-${pkgver},} # link source-ball root dir as VCS root dirname cd gstreamer - # ignore GL libs (however, this may break 'gst-plugin-opencv' build) - # gstreamer-1.22.5/subprojects/gst-plugins-bad/meson.build:331:12: - # ERROR: Neither a subproject directory nor a gst-plugins-base.wrap file was found. - # -> Failed to guess install tag for /usr/share/gstreamer-1.0/presets/GstFreeverb.prs - sed -i "s|required: get_option('gl')|required: false|" subprojects/gst-plugins-bad/meson.build - - # patch n/a (probably) + # arch patches usually do not apply to 'gst-plugins-bad'; though they may local grep_rx='^+++ b/subprojects/gst-plugins-bad/[^ ]' if grep "${grep_rx}" ../0001-HACK-meson-Disable-broken-tests.patch ; then # Disable broken tests - patch -Np1 < ../0001-HACK-meson-Disable-broken-tests.patch # DIFF: use source-ball not VCS + patch -Np1 < ../0001-HACK-meson-Disable-broken-tests.patch # DIFF: use source-ball, not VCS fi } @@ -251,12 +246,14 @@ build() { ## build ## - arch-meson gstreamer/subprojects/${pkgbase} build "${meson_options[@]}" # DIFF: use source-ball not VCS + arch-meson gstreamer/subprojects/${pkgbase} build "${meson_options[@]}" # DIFF: use source-ball, not VCS meson configure build # Print config meson compile -C build } check() ( + # networing tests fail in librechroots + # elements_rtpsrc, elements_rtpsink, elements_srtp, elements_netsim, elements_webrtcbin (( ! _DISABLE_TESTS )) || ! echo "skipping check()" || return 0 export XDG_RUNTIME_DIR="$PWD/runtime-dir" @@ -285,7 +282,7 @@ package_gst-plugins-bad-libs() { ) # arch has this command in the package_gstreamer() function - DESTDIR="$srcdir/root" meson install -C build + meson install -C build --destdir "$srcdir/root" cd root; local files=( usr/include/gstreamer-1.0/gst/audio/{audio-bad-prelude,gstnonstreamaudiodecoder,gstplanaraudioadapter}.h @@ -399,8 +396,8 @@ package_gst-plugins-bad() { ) # parabola tweaks - depends=( ${depends[*]/faac/} ) # non-free - [[ "${CARCH}" == x86_64 ]] || depends=( ${depends[*]/svt-hevc/} ) + depends=( ${depends[*]/faac/} ) # non-free + depends=( ${depends[*]/$([[ "${CARCH}" == x86_64 ]] || echo svt-hevc)/} ) # x86_64 only cd root; local files=( usr/lib/gstreamer-1.0/libgstaes.so @@ -467,12 +464,10 @@ package_gst-plugins-bad() { ) # parabola tweaks - [[ "${CARCH}" == x86_64 ]] || files=( + ${files[*]/usr\/lib\/gstreamer-1.0\/libgstfaac.so/} # non-free + ); [[ "${CARCH}" == x86_64 ]] || files=( ${files[*]/usr\/lib\/gstreamer-1.0\/libgstsvthevcenc.so/} # x86_64 only - ) - files=( - ${files[*]/usr\/lib\/gstreamer-1.0\/libgstfaac.so/} # non-free ); _install } From 9db3600b83ef25a2d6762333ff0a1205d603c58b Mon Sep 17 00:00:00 2001 From: bill-auger Date: Dec 24 2023 23:12:46 +0000 Subject: [PATCH 3/73] [texlive-bin]: add missing patch file --- diff --git a/libre/texlive-bin/context-luatex-1.17.patch b/libre/texlive-bin/context-luatex-1.17.patch new file mode 100644 index 0000000..08520cd --- /dev/null +++ b/libre/texlive-bin/context-luatex-1.17.patch @@ -0,0 +1,22 @@ +diff --git a/texk/texlive/linked_scripts/context/stubs/unix/mtxrun b/texk/texlive/linked_scripts/context/stubs/unix/mtxrun +index 6fc17adb0..722e9fc8f 100755 +--- a/texk/texlive/linked_scripts/context/stubs/unix/mtxrun ++++ b/texk/texlive/linked_scripts/context/stubs/unix/mtxrun +@@ -25606,7 +25606,7 @@ local function secondaryflags(arguments) + end + return concat(flags," ") + end +-local template=[[--ini %primaryflags% --lua=%luafile% %texfile% %secondaryflags% %redirect%]] ++local template=[[--ini %primaryflags% --socket --shell-escape --lua=%luafile% %texfile% %secondaryflags% %redirect%]] + local checkers={ + primaryflags="verbose", + secondaryflags="verbose", +@@ -25741,7 +25741,7 @@ function environment.make_format(formatname) + report_format() + lfs.chdir(startupdir) + end +-local template=[[%primaryflags% --fmt=%fmtfile% --lua=%luafile% %texfile% %secondaryflags%]] ++local template=[[%primaryflags% --socket --shell-escape --fmt=%fmtfile% --lua=%luafile% %texfile% %secondaryflags%]] + local checkers={ + primaryflags="verbose", + secondaryflags="verbose", From adb011cdfc771134820fff98edb266c0fa2120e7 Mon Sep 17 00:00:00 2001 From: David P Date: Dec 26 2023 18:09:18 +0000 Subject: [PATCH 4/73] updpkg: libre/linux-libre-pae 6.6.8-1 Signed-off-by: David P. --- diff --git a/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index ba0d753..200467d 100644 --- a/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 63cec1d1efdb31caeef17411c7560e8b0f941073 Mon Sep 17 00:00:00 2001 +From 5356bd2edba31be92ea71b8fa2167e2bc3b60fbc Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -14,10 +14,10 @@ Our default behavior continues to match the vanilla kernel. 5 files changed, 53 insertions(+) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h -index 33a4240e6a6f..82213f9c4c17 100644 +index 45f09bec02c4..87b20e2ee274 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h -@@ -139,6 +139,8 @@ static inline void set_rlimit_ucount_max(struct user_namespace *ns, +@@ -148,6 +148,8 @@ static inline void set_userns_rlimit_max(struct user_namespace *ns, #ifdef CONFIG_USER_NS @@ -26,7 +26,7 @@ index 33a4240e6a6f..82213f9c4c17 100644 static inline struct user_namespace *get_user_ns(struct user_namespace *ns) { if (ns) -@@ -172,6 +174,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); +@@ -181,6 +183,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); struct ns_common *ns_get_owner(struct ns_common *ns); #else @@ -36,10 +36,10 @@ index 33a4240e6a6f..82213f9c4c17 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index fa63cc019ebf..5aa29feccae3 100644 +index 6d35728b94b2..0562c8ca7b30 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1249,6 +1249,22 @@ config USER_NS +@@ -1226,6 +1226,22 @@ config USER_NS If unsure, say N. @@ -63,12 +63,12 @@ index fa63cc019ebf..5aa29feccae3 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 0d8abfb9e0f4..bd7c215e315f 100644 +index 177ce7438db6..6ecece1407fc 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -99,6 +99,10 @@ - #include - #include +@@ -100,6 +100,10 @@ + #include + #include +#ifdef CONFIG_USER_NS +#include @@ -77,7 +77,7 @@ index 0d8abfb9e0f4..bd7c215e315f 100644 #include #include #include -@@ -1992,6 +1996,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -2260,6 +2264,10 @@ __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -88,7 +88,7 @@ index 0d8abfb9e0f4..bd7c215e315f 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3128,6 +3136,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3413,6 +3421,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,20 +102,20 @@ index 0d8abfb9e0f4..bd7c215e315f 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index c42ba2d669dc..a6ddbf02a809 100644 +index 354a2d294f52..5bc5605e7cdb 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -91,6 +91,9 @@ - #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) - #include +@@ -80,6 +80,9 @@ + #ifdef CONFIG_RT_MUTEXES + #include #endif +#ifdef CONFIG_USER_NS +#include +#endif - #if defined(CONFIG_SYSCTL) - -@@ -1806,6 +1809,15 @@ static struct ctl_table kern_table[] = { + /* shared constants to be used in various sysctls */ + const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 }; +@@ -1623,6 +1626,15 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, @@ -132,10 +132,10 @@ index c42ba2d669dc..a6ddbf02a809 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 5481ba44a8d6..423ab2563ad7 100644 +index 1d8e47bed3f1..fec01d016a35 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c -@@ -21,6 +21,13 @@ +@@ -22,6 +22,13 @@ #include #include @@ -150,5 +150,5 @@ index 5481ba44a8d6..423ab2563ad7 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.37.1 +2.43.0 diff --git a/libre/linux-libre-pae/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch b/libre/linux-libre-pae/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch deleted file mode 100644 index 7212fe4..0000000 --- a/libre/linux-libre-pae/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 4b81eecd4c636d953aaf4ebafd8171716f4c61fe Mon Sep 17 00:00:00 2001 -From: Bryan Cain -Date: Thu, 5 May 2022 13:12:21 -0600 -Subject: [PATCH 2/3] HID: apple: Properly handle function keys on Keychron - keyboards -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Keychron's C-series and K-series of keyboards copy the vendor and -product IDs of an Apple keyboard, but only behave like that device when -set to "Mac" mode. In "Windows" mode, the Fn key doesn't generate a -scancode, so it's impossible to use the F1-F12 keys when fnmode is set -to its default value of 1. - -To fix this, make fnmode default to the new value of 3, which behaves -like fnmode=2 for Keychron keyboards and like fnmode=1 for actual Apple -keyboards. This way, Keychron devices are fully usable in both "Windows" -and "Mac" modes, while behavior is unchanged for everything else. - -Signed-off-by: Bryan Cain -Reviewed-by: Hans de Goede -Tested-by: José Expósito -Signed-off-by: Jiri Kosina ---- - drivers/hid/hid-apple.c | 22 ++++++++++++++++++---- - 1 file changed, 18 insertions(+), 4 deletions(-) - -diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c -index 0cf35caee9fa..42a568902f49 100644 ---- a/drivers/hid/hid-apple.c -+++ b/drivers/hid/hid-apple.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "hid-ids.h" - -@@ -35,16 +36,17 @@ - #define APPLE_NUMLOCK_EMULATION BIT(8) - #define APPLE_RDESC_BATTERY BIT(9) - #define APPLE_BACKLIGHT_CTL BIT(10) -+#define APPLE_IS_KEYCHRON BIT(11) - - #define APPLE_FLAG_FKEY 0x01 - - #define HID_COUNTRY_INTERNATIONAL_ISO 13 - #define APPLE_BATTERY_TIMEOUT_MS 60000 - --static unsigned int fnmode = 1; -+static unsigned int fnmode = 3; - module_param(fnmode, uint, 0644); - MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, " -- "[1] = fkeyslast, 2 = fkeysfirst)"); -+ "1 = fkeyslast, 2 = fkeysfirst, [3] = auto)"); - - static int iso_layout = -1; - module_param(iso_layout, int, 0644); -@@ -349,6 +351,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, - const struct apple_key_translation *trans, *table; - bool do_translate; - u16 code = 0; -+ unsigned int real_fnmode; - - u16 fn_keycode = (swap_fn_leftctrl) ? (KEY_LEFTCTRL) : (KEY_FN); - -@@ -359,7 +362,13 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, - return 1; - } - -- if (fnmode) { -+ if (fnmode == 3) { -+ real_fnmode = (asc->quirks & APPLE_IS_KEYCHRON) ? 2 : 1; -+ } else { -+ real_fnmode = fnmode; -+ } -+ -+ if (real_fnmode) { - if (hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS || -@@ -406,7 +415,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, - - if (!code) { - if (trans->flags & APPLE_FLAG_FKEY) { -- switch (fnmode) { -+ switch (real_fnmode) { - case 1: - do_translate = !asc->fn_on; - break; -@@ -660,6 +669,11 @@ static int apple_input_configured(struct hid_device *hdev, - asc->quirks &= ~APPLE_HAS_FN; - } - -+ if (strncmp(hdev->name, "Keychron", 8) == 0) { -+ hid_info(hdev, "Keychron keyboard detected; function keys will default to fnmode=2 behavior\n"); -+ asc->quirks |= APPLE_IS_KEYCHRON; -+ } -+ - return 0; - } - --- -2.37.1 - diff --git a/libre/linux-libre-pae/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch b/libre/linux-libre-pae/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch new file mode 100644 index 0000000..3d2d12a --- /dev/null +++ b/libre/linux-libre-pae/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch @@ -0,0 +1,89 @@ +From 71702f17b7826fda819d56e329680eb655344fcb Mon Sep 17 00:00:00 2001 +From: Javier Martinez Canillas +Date: Thu, 19 May 2022 14:40:07 +0200 +Subject: [PATCH 2/2] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 + is set + +The Nvidia proprietary driver has some bugs that leads to issues if used +with the simpledrm driver. The most noticeable is that does not register +an emulated fbdev device. + +It just relies on a fbdev to be registered by another driver, that could +be that could be attached to the framebuffer console. On UEFI machines, +this is the efifb driver. + +This means that disabling the efifb driver will cause virtual consoles to +not be present in the system when using the Nvidia driver. Legacy BIOS is +not affected just because fbcon is not used there, but instead vgacon. + +Unless a VGA mode is specified using the vga= kernel command line option, +in that case the vesafb driver is used instead and its fbdev attached to +the fbcon. + +This is a problem because with CONFIG_SYSFB_SIMPLEFB=y, the sysfb platform +code attempts to register a "simple-framebuffer" platform device (that is +matched against simpledrm) and only registers either an "efi-framebuffer" +or "vesa-framebuffer" if this fails to be registered due the video modes +not being compatible. + +The Nvidia driver relying on another driver to register the fbdev is quite +fragile, since it can't really assume those will stick around. For example +there are patches posted to remove the EFI and VESA platform devices once +a real DRM or fbdev driver probes. + +But in any case, moving to a simpledrm + emulated fbdev only breaks this +assumption and causes users to not have VT if the Nvidia driver is used. + +So to prevent this, let's add a workaround and make the sysfb to skip the +"simple-framebuffer" registration when nvidia-drm.modeset=1 option is set. + +This is quite horrible, but honestly I can't think of any other approach. + +For this to work, the CONFIG_FB_EFI and CONFIG_FB_VESA config options must +be enabled besides CONFIG_DRM_SIMPLEDRM. + +Signed-off-by: Javier Martinez Canillas +Cherry-picked-for: https://bugs.archlinux.org/task/73720 +--- + drivers/firmware/sysfb.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c +index 82fcfd29bc4d..17b7e096b682 100644 +--- a/drivers/firmware/sysfb.c ++++ b/drivers/firmware/sysfb.c +@@ -34,6 +34,22 @@ + #include + #include + ++static int skip_simpledrm; ++ ++static int __init simpledrm_disable(char *opt) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ get_option(&opt, &skip_simpledrm); ++ ++ if (skip_simpledrm) ++ pr_info("The simpledrm driver will not be probed\n"); ++ ++ return 0; ++} ++early_param("nvidia-drm.modeset", simpledrm_disable); ++ + static struct platform_device *pd; + static DEFINE_MUTEX(disable_lock); + static bool disabled; +@@ -85,7 +101,7 @@ static __init int sysfb_init(void) + + /* try to create a simple-framebuffer device */ + compatible = sysfb_parse_mode(si, &mode); +- if (compatible) { ++ if (compatible && !skip_simpledrm) { + pd = sysfb_create_simplefb(si, &mode); + if (!IS_ERR(pd)) + goto unlock_mutex; +-- +2.43.0 + diff --git a/libre/linux-libre-pae/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch b/libre/linux-libre-pae/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch deleted file mode 100644 index 606afbd..0000000 --- a/libre/linux-libre-pae/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2da21cf28e573b84e5a5baecc1eda7372322375d Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Sat, 23 Jul 2022 11:14:46 +0200 -Subject: [PATCH 3/3] soundwire: Raise DEFAULT_PROBE_TIMEOUT to 10000 ms - -See: https://github.com/thesofproject/linux/issues/3777#issuecomment-1192655300 ---- - drivers/soundwire/bus.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h -index 7631ef5e71fb..d3ed828daac0 100644 ---- a/drivers/soundwire/bus.h -+++ b/drivers/soundwire/bus.h -@@ -5,7 +5,7 @@ - #define __SDW_BUS_H - - #define DEFAULT_BANK_SWITCH_TIMEOUT 3000 --#define DEFAULT_PROBE_TIMEOUT 2000 -+#define DEFAULT_PROBE_TIMEOUT 10000 - - u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr); - --- -2.37.1 - diff --git a/libre/linux-libre-pae/PKGBUILD b/libre/linux-libre-pae/PKGBUILD index 556683c..7930caa 100644 --- a/libre/linux-libre-pae/PKGBUILD +++ b/libre/linux-libre-pae/PKGBUILD @@ -9,18 +9,31 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-pae -pkgver=5.18.14 +pkgver=6.6.8 pkgrel=1 pkgdesc='Linux-libre PAE (physical address extension)' url='https://linux-libre.fsfla.org/' arch=(i686) license=(GPL2) makedepends=( - bc libelf pahole cpio perl tar xz - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra + bc + cpio + gettext + libelf + pahole + perl + python + tar + xz + + # htmldocs + #graphviz + #imagemagick + #python-sphinx + #texlive-latexextra ) options=('!strip') -_srcname=linux-5.18 +_srcname=linux-6.6 source=( "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} "https://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign} @@ -36,32 +49,46 @@ source=( 0002-fix-Atmel-maXTouch-touchscreen-support.patch # Arch Linux patches 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch - 0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch - # Arch Linux 32 patches + 0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch + # avoid using zstd compression in ultra mode (exhausts virtual memory) no-ultra-zstd.patch ) validpgpkeys=( - '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P. + 474402C8C582DAFBE389C427BCB7CF877E7D47A7 # Alexandre Oliva + 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 # David P. ) -sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb' +sha256sums=('d71785bdb694fefaa4f183e5dd2ffc453c179db6f9427cc37e1ed046f0073ccf' 'SKIP' - '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34' + '4193aba41ae2eed56059b7fe917fa0b933573578b7a71f4e0fdb7a4487075170' 'SKIP' - '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' + 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' - '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' + '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' 'SKIP' - '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' + '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' 'SKIP' - '145f8eb30125ee4bf1e2b37027ec762d2a15511dcf7eae3ad09472a682492d8f38fb606b2e81acac557de318a71b6d988b03c8680208b75c2be9bc1483b43e10' - '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' - 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - '671ab29fb1858c3898792164ac49d57103ecdeff220d7b262efb0c74ee270a670cf40f746a76f400513019989d858326fb3da507a0159418215e0b645011c406' - '2fecb2fb31981af21e17ce08c8352236f8817e6000f7e542f7479eaa7300238c4581f992b4da4d49dd2657d3e3c038eb0369954559f233b2913c382ef25b5753' - '816ad9cb93a473376487234d4bf255f7d081c37186b1715e914c2c30dcdcfaee7b6db4eeb427969190d0cffa7499bc99c95ef58fb8c632d27e51d0350990f0ce' - 'bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85') + '8a8b10cbb3acb6904cf90f462c1c3fd41b2a2f8f31e42fe4f18c8b4df17347f5' + '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' + '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25' + 'f42b4d1cbde46fd9c2e3b9baaecb0a50fab3aa423a621a7849c42b5ddbbfa9b8' + '1ee62f3e582ffb63323097ff0698572b33507d1ff3dd3c88f7071dfa7a22fc24' + 'd32270be5fd9c3e3ba50f3aef33f6cfcb85be0c8216f03b777287cc621fdff28') +b2sums=('e3e753fed07258f34e2e44e1acd4be0c22a3c58a3ae4856b518a4f99358f5bf6e8f38e41f422d9a434b33b0d7ee972e93ac7d37c9734949d6db263afe4c4f47c' + 'SKIP' + '53cb120b0bc8bce90e19fce0a69d05ab3f69d07ce75976d2106e0edaf5699fb71f777b1913c1fc36075d9dc46d3f4bfa1f9e4f2e7901bae869c28d3642a0a93e' + 'SKIP' + '73fee2ae5cb1ffd3e6584e56da86a8b1ff6c713aae54d77c0dab113890fc673dc5f300eb9ed93fb367b045ece8fa80304ff277fe61665eccf7b7ce24f0c045eb' + 'SKIP' + 'd02a1153a4285b32c774dca4560fe37907ccf30b8e487a681b717ed95ae9bed5988875c0a118938e5885ae9d2857e53a6f216b732b6fa3368e3c5fe08c86382c' + 'SKIP' + '580911af9431c066bbc072fd22d5e2ef65f12d8358cec5ff5a4f1b7deebb86cef6b5c1ad631f42350af72c51d44d2093c71f761234fb224a8b9dbb3b64b8201d' + 'SKIP' + 'e18118ef69486e8839926c92a3f5f3842e6561065781c8e182a29167cd8d80e9198cb1def3611ad54c0b696d6e634ec4631c49b9449c05718790ed0fb1491eec' + 'c2214154c36900e311531bfe68184f31639f5c50fed23bc3803a7f18439b7ff258552a39f02fed0ea92f10744e17a6c55cef0ef1a98187f978fe480fb3dddc14' + '0c7ceba7cd90087db3296610a07886f337910bad265a32c052d3a703e6eb8e53f355ab9948d72d366408d968d8ee7435084dd89bef5ed0b69355fd884c2cd468' + '4f5df7bb477f09855294fd4afd6adedd97f1a96051d350a936cb3e061de9c599130e9db4a820d5b70086b8fac5e9e294ca2898fa924310c4fae684c2fbf9c5bc' + '9419a4ff2104313df9e40cd1e7f3f7629b4beec27e60b27c4935bb57a245c7b63189ffe38a70ca834d025708c489c623f2734a0e0b3260dde14e871c52455911' + '165ab9dd8cedeaae5327accc1581c19cf0be55f923b03feb889cad3351b74c7c4cd3d3c206938e5152bfe1d947513dea8f630f8f5544099ec13d16d254725c40') _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") _replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}") @@ -84,7 +111,6 @@ prepare() { ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm} echo "Setting version..." - scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux-libre}" > localversion.20-pkgname @@ -92,6 +118,7 @@ prepare() { for src in "${source[@]}"; do src="${src%%::*}" src="${src##*/}" + src="${src%.zst}" [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -108,22 +135,34 @@ prepare() { build() { cd $_srcname - make htmldocs all + make all + #make htmldocs } _package() { pkgdesc="The $pkgdesc kernel and modules" - depends=(coreutils kmod initramfs) - optdepends=('wireless-regdb: to set the correct wireless channels of your country' - 'linux-libre-firmware: firmware images needed for some devices') - provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE) + depends=( + coreutils + initramfs + kmod + ) + optdepends=( + 'wireless-regdb: to set the correct wireless channels of your country' + 'linux-libre-firmware: firmware images needed for some devices' + ) + provides=( + KSMBD-MODULE + VIRTUALBOX-GUEST-MODULES + WIREGUARD-MODULE + ) + replaces=( + ) provides+=("${_replacesarchkernel[@]/%/=${pkgver%.*}}" "LINUX-ABI_VERSION=${pkgver%.*}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") cd $_srcname - local kernver="$( Date: Dec 26 2023 18:11:55 +0000 Subject: [PATCH 5/73] updpkg: libre/linux-libre-hardened 6.6.8.hardened1-1 Signed-off-by: David P. --- diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD index 3b49f05..fea5fe2 100644 --- a/libre/linux-libre-hardened/PKGBUILD +++ b/libre/linux-libre-hardened/PKGBUILD @@ -9,18 +9,31 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-hardened -pkgver=5.18.12.hardened1 +pkgver=6.6.8.hardened1 pkgrel=1 pkgdesc='Security-Hardened Linux-libre' url='https://linux-libre.fsfla.org/' arch=(x86_64) license=(GPL2) makedepends=( - bc libelf pahole cpio perl tar xz - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra + bc + cpio + gettext + libelf + pahole + perl + python + tar + xz + + # htmldocs + graphviz + imagemagick + python-sphinx + texlive-latexextra ) options=('!strip') -_srcname=linux-5.18 +_srcname=linux-6.6 _srctag=${pkgver%.*}-${pkgver##*.} source=( "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} @@ -38,27 +51,42 @@ source=( 0002-fix-Atmel-maXTouch-touchscreen-support.patch ) validpgpkeys=( - '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay - '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P. - 'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak + 474402C8C582DAFBE389C427BCB7CF877E7D47A7 # Alexandre Oliva + 65EEFE022108E2B708CBFCF7F9E712E59AF5F22A # Daniel Micay + 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 # David P. + E240B57E2C4630BA768E2F26FC1B547C8D8172C8 # Levente Polyak ) -sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb' +sha256sums=('d71785bdb694fefaa4f183e5dd2ffc453c179db6f9427cc37e1ed046f0073ccf' 'SKIP' - '8093255d5508830de397707ad492cdb90c205d8a2eebb3f9b5a2eb32a51493dbfaf27f8fb546faa1bee41b3632c635e9e24b702f54ad4a28ebb10c0b4a7cb196' + '4193aba41ae2eed56059b7fe917fa0b933573578b7a71f4e0fdb7a4487075170' 'SKIP' - '1bd6ae6b24bdabe56c37cc6fac7c6d43bcb2c62acaa8b80710482a94251528e91f6c85ab177f7a49fb7c3e591c64cc2976312e1ba9cd37c6139bd4f44ef1d53e' + '693d082ffc74dbe0a7ef1ad332206bd4c591c3ecf9895d58be37acddd7b85956' 'SKIP' - '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' + 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' - '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' + '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' 'SKIP' - '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' + '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' 'SKIP' - 'db147db1f15f82a365275e9042a47617bb32d4bf9c25575d1151d478a90668b604c26ab415c5438c11a32777d2f63f7fc63ab9d61148b13751470a9971223896' - '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' - 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168') - + 'a803e9d0a4312ba6f21b96d1326814b026bd241367692cbb45210dc62aa91a29' + '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' + '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25') +b2sums=('e3e753fed07258f34e2e44e1acd4be0c22a3c58a3ae4856b518a4f99358f5bf6e8f38e41f422d9a434b33b0d7ee972e93ac7d37c9734949d6db263afe4c4f47c' + 'SKIP' + '53cb120b0bc8bce90e19fce0a69d05ab3f69d07ce75976d2106e0edaf5699fb71f777b1913c1fc36075d9dc46d3f4bfa1f9e4f2e7901bae869c28d3642a0a93e' + 'SKIP' + 'c58931b56e8663cc42d12e3dab3783aa24ac6f349e987cf20cc40202845e634b0f7e81bc03d09a563dfd00da788628bf65c5c4e56812df016e8be6751021529f' + 'SKIP' + '73fee2ae5cb1ffd3e6584e56da86a8b1ff6c713aae54d77c0dab113890fc673dc5f300eb9ed93fb367b045ece8fa80304ff277fe61665eccf7b7ce24f0c045eb' + 'SKIP' + 'd02a1153a4285b32c774dca4560fe37907ccf30b8e487a681b717ed95ae9bed5988875c0a118938e5885ae9d2857e53a6f216b732b6fa3368e3c5fe08c86382c' + 'SKIP' + '580911af9431c066bbc072fd22d5e2ef65f12d8358cec5ff5a4f1b7deebb86cef6b5c1ad631f42350af72c51d44d2093c71f761234fb224a8b9dbb3b64b8201d' + 'SKIP' + '3be4fd80ce5eeea261ae279f30aa0d973aa59e7d4370635e8c3820613eb31514c432dbc996202d90e4f3da3200cadcd019f01d625f54d7e10f4f863e210cd3ca' + 'c2214154c36900e311531bfe68184f31639f5c50fed23bc3803a7f18439b7ff258552a39f02fed0ea92f10744e17a6c55cef0ef1a98187f978fe480fb3dddc14' + '0c7ceba7cd90087db3296610a07886f337910bad265a32c052d3a703e6eb8e53f355ab9948d72d366408d968d8ee7435084dd89bef5ed0b69355fd884c2cd468') + _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") _replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}") _replacesoldmodules=("${_replacesoldmodules[@]/\%/${pkgbase#linux-libre}}") @@ -82,7 +110,6 @@ prepare() { echo "Setting version..." sed -e "/^[-+]EXTRAVERSION =/s/= */= -gnu/" \ -i "../linux-hardened-$_srctag.patch" - scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux-libre}" > localversion.20-pkgname @@ -90,6 +117,7 @@ prepare() { for src in "${source[@]}"; do src="${src%%::*}" src="${src##*/}" + src="${src%.zst}" [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -106,23 +134,39 @@ prepare() { build() { cd $_srcname - make htmldocs all + + make htmldocs & + local pid_docs=$! + + make all + wait "${pid_docs}" } _package() { pkgdesc="The $pkgdesc kernel and modules" - depends=(coreutils kmod initramfs) - optdepends=('wireless-regdb: to set the correct wireless channels of your country' - 'linux-libre-firmware: firmware images needed for some devices' - 'usbctl: deny_new_usb control') - provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE) + depends=( + coreutils + initramfs + kmod + ) + optdepends=( + 'wireless-regdb: to set the correct wireless channels of your country' + 'linux-libre-firmware: firmware images needed for some devices' + 'usbctl: deny_new_usb control' + ) + provides=( + KSMBD-MODULE + VIRTUALBOX-GUEST-MODULES + WIREGUARD-MODULE + ) + replaces=( + ) provides+=("${_replacesarchkernel[@]/%/=${pkgver%.*}}" "LINUX-ABI_VERSION=${pkgver%.*}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") cd $_srcname - local kernver="$( Date: Dec 26 2023 23:36:58 +0000 Subject: [PATCH 6/73] updpkg: libre/linux-libre 6.6.8-1 Signed-off-by: David P. --- diff --git a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index ce00410..200467d 100644 --- a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,4 +1,4 @@ -From 59f2f4ec4f5168b6c8945d59b9859d8b2321882b Mon Sep 17 00:00:00 2001 +From 5356bd2edba31be92ea71b8fa2167e2bc3b60fbc Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 16 Sep 2019 04:53:20 +0200 Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged @@ -36,10 +36,10 @@ index 45f09bec02c4..87b20e2ee274 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index c88bb30a8b0b..32ba96d94028 100644 +index 6d35728b94b2..0562c8ca7b30 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1249,6 +1249,22 @@ config USER_NS +@@ -1226,6 +1226,22 @@ config USER_NS If unsure, say N. @@ -63,12 +63,12 @@ index c88bb30a8b0b..32ba96d94028 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index ea332319dffe..349945168239 100644 +index 177ce7438db6..6ecece1407fc 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -98,6 +98,10 @@ - #include - #include +@@ -100,6 +100,10 @@ + #include + #include +#ifdef CONFIG_USER_NS +#include @@ -77,7 +77,7 @@ index ea332319dffe..349945168239 100644 #include #include #include -@@ -2032,6 +2036,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -2260,6 +2264,10 @@ __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -88,7 +88,7 @@ index ea332319dffe..349945168239 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3182,6 +3190,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3413,6 +3421,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,10 +102,10 @@ index ea332319dffe..349945168239 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 1c240d2c99bc..2971581a27e2 100644 +index 354a2d294f52..5bc5605e7cdb 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -81,6 +81,9 @@ +@@ -80,6 +80,9 @@ #ifdef CONFIG_RT_MUTEXES #include #endif @@ -115,7 +115,7 @@ index 1c240d2c99bc..2971581a27e2 100644 /* shared constants to be used in various sysctls */ const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 }; -@@ -1645,6 +1648,15 @@ static struct ctl_table kern_table[] = { +@@ -1623,6 +1626,15 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, @@ -150,5 +150,5 @@ index 1d8e47bed3f1..fec01d016a35 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.40.1 +2.43.0 diff --git a/libre/linux-libre/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch b/libre/linux-libre/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch new file mode 100644 index 0000000..3d2d12a --- /dev/null +++ b/libre/linux-libre/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch @@ -0,0 +1,89 @@ +From 71702f17b7826fda819d56e329680eb655344fcb Mon Sep 17 00:00:00 2001 +From: Javier Martinez Canillas +Date: Thu, 19 May 2022 14:40:07 +0200 +Subject: [PATCH 2/2] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 + is set + +The Nvidia proprietary driver has some bugs that leads to issues if used +with the simpledrm driver. The most noticeable is that does not register +an emulated fbdev device. + +It just relies on a fbdev to be registered by another driver, that could +be that could be attached to the framebuffer console. On UEFI machines, +this is the efifb driver. + +This means that disabling the efifb driver will cause virtual consoles to +not be present in the system when using the Nvidia driver. Legacy BIOS is +not affected just because fbcon is not used there, but instead vgacon. + +Unless a VGA mode is specified using the vga= kernel command line option, +in that case the vesafb driver is used instead and its fbdev attached to +the fbcon. + +This is a problem because with CONFIG_SYSFB_SIMPLEFB=y, the sysfb platform +code attempts to register a "simple-framebuffer" platform device (that is +matched against simpledrm) and only registers either an "efi-framebuffer" +or "vesa-framebuffer" if this fails to be registered due the video modes +not being compatible. + +The Nvidia driver relying on another driver to register the fbdev is quite +fragile, since it can't really assume those will stick around. For example +there are patches posted to remove the EFI and VESA platform devices once +a real DRM or fbdev driver probes. + +But in any case, moving to a simpledrm + emulated fbdev only breaks this +assumption and causes users to not have VT if the Nvidia driver is used. + +So to prevent this, let's add a workaround and make the sysfb to skip the +"simple-framebuffer" registration when nvidia-drm.modeset=1 option is set. + +This is quite horrible, but honestly I can't think of any other approach. + +For this to work, the CONFIG_FB_EFI and CONFIG_FB_VESA config options must +be enabled besides CONFIG_DRM_SIMPLEDRM. + +Signed-off-by: Javier Martinez Canillas +Cherry-picked-for: https://bugs.archlinux.org/task/73720 +--- + drivers/firmware/sysfb.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c +index 82fcfd29bc4d..17b7e096b682 100644 +--- a/drivers/firmware/sysfb.c ++++ b/drivers/firmware/sysfb.c +@@ -34,6 +34,22 @@ + #include + #include + ++static int skip_simpledrm; ++ ++static int __init simpledrm_disable(char *opt) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ get_option(&opt, &skip_simpledrm); ++ ++ if (skip_simpledrm) ++ pr_info("The simpledrm driver will not be probed\n"); ++ ++ return 0; ++} ++early_param("nvidia-drm.modeset", simpledrm_disable); ++ + static struct platform_device *pd; + static DEFINE_MUTEX(disable_lock); + static bool disabled; +@@ -85,7 +101,7 @@ static __init int sysfb_init(void) + + /* try to create a simple-framebuffer device */ + compatible = sysfb_parse_mode(si, &mode); +- if (compatible) { ++ if (compatible && !skip_simpledrm) { + pd = sysfb_create_simplefb(si, &mode); + if (!IS_ERR(pd)) + goto unlock_mutex; +-- +2.43.0 + diff --git a/libre/linux-libre/0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch b/libre/linux-libre/0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch deleted file mode 100644 index 73b1a4a..0000000 --- a/libre/linux-libre/0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 2fd9916a465e3b62452ac4346def013c3d8698a4 Mon Sep 17 00:00:00 2001 -From: Fangzhi Zuo -Date: Wed, 17 May 2023 19:37:13 +0800 -Subject: [PATCH 2/2] drm/amd/display: Have Payload Properly Created After - Resume - -At drm suspend sequence, MST dc_sink is removed. When commit cached -MST stream back in drm resume sequence, the MST stream payload is not -properly created and added into the payload table. After resume, topology -change is reprobed by removing existing streams first. That leads to -no payload is found in the existing payload table as below error -"[drm] ERROR No payload for [MST PORT:] found in mst state" - -1. In encoder .atomic_check routine, remove check existance of dc_sink -2. Bypass MST by checking existence of MST root port. dc_link_type cannot -differentiate MST port before topology is rediscovered. - -Reviewed-by: Wayne Lin -Acked-by: Tom Chung -Signed-off-by: Fangzhi Zuo -(cherry picked from https://patchwork.freedesktop.org/patch/537553/) ---- - drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index f54d670ab3ab..0695c7c3d489 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -2813,7 +2813,7 @@ static int dm_resume(void *handle) - * this is the case when traversing through already created - * MST connectors, should be skipped - */ -- if (aconnector->dc_link->type == dc_connection_mst_branch) -+ if (aconnector && aconnector->mst_root) - continue; - - mutex_lock(&aconnector->hpd_lock); -@@ -6717,7 +6717,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, - int clock, bpp = 0; - bool is_y420 = false; - -- if (!aconnector->mst_output_port || !aconnector->dc_sink) -+ if (!aconnector->mst_output_port) - return 0; - - mst_port = aconnector->mst_output_port; --- -2.40.1 - diff --git a/libre/linux-libre/0005-set-default-cubietruck-led-triggers.patch b/libre/linux-libre/0005-set-default-cubietruck-led-triggers.patch deleted file mode 100644 index 76796e2..0000000 --- a/libre/linux-libre/0005-set-default-cubietruck-led-triggers.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3a5136fec1bdb0f7a5ca614dab47c55c3177d26a Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sat, 14 Feb 2015 12:32:27 +0100 -Subject: [PATCH 5/7] set default cubietruck led triggers - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index 52160e368304..21c8ef94c756 100644 ---- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -@@ -78,6 +78,7 @@ leds { - led-0 { - label = "cubietruck:blue:usr"; - gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; - }; - - led-1 { -@@ -93,6 +94,7 @@ led-2 { - led-3 { - label = "cubietruck:green:usr"; - gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "mmc0"; - }; - }; - --- -2.37.0 - diff --git a/libre/linux-libre/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/libre/linux-libre/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch deleted file mode 100644 index 4d19cce..0000000 --- a/libre/linux-libre/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c87c82c5a03baf1202d22567e4f6d113cfe17bad Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Thu, 11 Aug 2016 00:42:37 -0600 -Subject: [PATCH 6/7] exynos4412-odroid: set higher minimum buck2 regulator - voltage - -Set a higher minimum voltage to help reboot issue. -http://www.spinics.net/lists/linux-samsung-soc/msg54434.html - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -index e7669b9e9edb..a1b4e182717f 100644 ---- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -@@ -436,7 +436,7 @@ buck1_reg: BUCK1 { - - buck2_reg: BUCK2 { - regulator-name = "VDD_ARM"; -- regulator-min-microvolt = <900000>; -+ regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-boot-on; --- -2.37.0 - diff --git a/libre/linux-libre/0007-USB-Armory-MkII-support.patch b/libre/linux-libre/0007-USB-Armory-MkII-support.patch deleted file mode 100644 index 3d52336..0000000 --- a/libre/linux-libre/0007-USB-Armory-MkII-support.patch +++ /dev/null @@ -1,561 +0,0 @@ -From 23e406e404f935be33c917ca7772466dd52582c3 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sun, 11 Aug 2019 12:34:17 -0600 -Subject: [PATCH 7/7] USB Armory MkII support - ---- - arch/arm/boot/dts/Makefile | 2 + - arch/arm/boot/dts/imx6ul-usbarmory.dts | 256 +++++++++++++++++++++++ - arch/arm/boot/dts/imx6ull-usbarmory.dts | 257 ++++++++++++++++++++++++ - 3 files changed, 515 insertions(+) - create mode 100644 arch/arm/boot/dts/imx6ul-usbarmory.dts - create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 05d8aef6e5d2..c6c76fa5047f 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -722,6 +722,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ - imx6ul-tx6ul-0010.dtb \ - imx6ul-tx6ul-0011.dtb \ - imx6ul-tx6ul-mainboard.dtb \ -+ imx6ul-usbarmory.dtb \ - imx6ull-14x14-evk.dtb \ - imx6ull-colibri-aster.dtb \ - imx6ull-colibri-emmc-aster.dtb \ -@@ -745,6 +746,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ - imx6ull-phytec-tauri-nand.dtb \ - imx6ull-tqma6ull2-mba6ulx.dtb \ - imx6ull-tqma6ull2l-mba6ulx.dtb \ -+ imx6ull-usbarmory.dtb \ - imx6ulz-14x14-evk.dtb \ - imx6ulz-bsh-smm-m2.dtb - dtb-$(CONFIG_SOC_IMX7D) += \ -diff --git a/arch/arm/boot/dts/imx6ul-usbarmory.dts b/arch/arm/boot/dts/imx6ul-usbarmory.dts -new file mode 100644 -index 000000000000..1fdcd6f611d5 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6ul-usbarmory.dts -@@ -0,0 +1,256 @@ -+/* -+ * USB armory Mk II device tree file -+ * https://github.com/inversepath/usbarmory -+ * -+ * Copyright (C) 2019, F-Secure Corporation -+ * Andrej Rosano -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "imx6ul.dtsi" -+ -+/ { -+ model = "F-Secure USB armory Mk II"; -+ compatible = "inversepath,imx6ul-usbarmory-mkII", "fsl,imx6ul"; -+ -+ chosen { -+ stdout-path = &uart2; -+ }; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x80000000 0x20000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_led>; -+ -+ led-white { -+ label = "LED_WHITE"; -+ gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ -+ led-blue { -+ label = "LED_BLUE"; -+ gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ regulators { -+ compatible = "simple-bus"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ reg_sd1_vmmc: sd1_regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "VSD_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ }; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_bluetooth>; -+ uart-has-rtscts; -+ status = "okay"; -+}; -+ -+&uart2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart2>; -+ status = "okay"; -+}; -+ -+&usdhc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc1>; -+ no-1-8-v; -+ keep-power-in-suspend; -+ wakeup-source; -+ status = "okay"; -+}; -+ -+&usdhc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc2>; -+ non-removable; -+ status = "okay"; -+}; -+ -+&i2c1 { -+ pinctrl-0 = <&pinctrl_i2c1>; -+ status = "okay"; -+}; -+ -+&iomuxc { -+ pinctrl_uart2: uart2grp { -+ fsl,pins = < -+ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1 -+ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1 -+ >; -+ }; -+ -+ pinctrl_bluetooth: uart1grp { -+ fsl,pins = < -+ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b0 /* BT_UART_TX */ -+ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b0 /* BT_UART_RX */ -+ MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS 0x1b0b0 /* BT_UART_CTS */ -+ MX6UL_PAD_GPIO1_IO07__UART1_DCE_RTS 0x130b0 /* BT_UART_RTS */ -+ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x1f020 /* BT_UART_DSR */ -+ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10020 /* BT_UART_DTR */ -+ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x1f020 /* BT_SWDCLK */ -+ MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1f020 /* BT_SWDIO */ -+ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1f020 /* BT_RESET */ -+ MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x1f020 /* BT_SWITCH_1 */ -+ MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x1f020 /* BT_SWITCH_2 */ -+ >; -+ }; -+ -+ pinctrl_i2c1: i2c1grp { -+ fsl,pins = < -+ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0 -+ MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0 -+ >; -+ }; -+ -+ pinctrl_led: ledgrp { -+ fsl,pins = < -+ MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x1f020 -+ MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x1f020 -+ >; -+ }; -+ -+ pinctrl_usdhc1: usdhc1grp { -+ fsl,pins = < -+ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x1f019 -+ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x1f019 -+ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x1f019 -+ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x1f019 -+ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x1f019 -+ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x1f019 -+ >; -+ }; -+ -+ pinctrl_usdhc2: usdhc2grp { -+ fsl,pins = < -+ MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10071 -+ MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 -+ MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 -+ MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 -+ MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 -+ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 -+ MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 -+ MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 -+ MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 -+ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 -+ >; -+ }; -+}; -+ -+&aips2 { -+ crypto: crypto@2140000 { -+ compatible = "fsl,imx6ul-caam", "fsl,sec-v4.0"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ reg = <0x2140000 0x3c000>; -+ ranges = <0 0x2140000 0x3c000>; -+ interrupts = ; -+ clocks = <&clks IMX6UL_CLK_CAAM_IPG>, <&clks IMX6UL_CLK_CAAM_ACLK>, -+ <&clks IMX6UL_CLK_CAAM_MEM>; -+ clock-names = "ipg", "aclk", "mem"; -+ -+ sec_jr0: jr@1000 { -+ compatible = "fsl,sec-v4.0-job-ring"; -+ reg = <0x1000 0x1000>; -+ interrupts = ; -+ }; -+ -+ sec_jr1: jr@2000 { -+ compatible = "fsl,sec-v4.0-job-ring"; -+ reg = <0x2000 0x1000>; -+ interrupts = ; -+ }; -+ sec_jr2: jr@3000 { -+ compatible = "fsl,sec-v4.0-job-ring"; -+ reg = <0x3000 0x1000>; -+ interrupts = ; -+ }; -+ }; -+}; -+ -+/ { -+ soc { -+ caam_sm: caam-sm@00100000 { -+ compatible = "fsl,imx7d-caam-sm", "fsl,imx6q-caam-sm"; -+ reg = <0x00100000 0x3fff>; -+ }; -+ -+ irq_sec_vio: caam_secvio { -+ compatible = "fsl,imx7d-caam-secvio", "fsl,imx6q-caam-secvio"; -+ interrupts = ; -+ }; -+ }; -+ -+ caam_keyblob: caam-keyblob { -+ compatible = "fsl,sec-v4.0-keyblob"; -+ status = "okay"; -+ }; -+}; -+ -+&usbotg1 { -+ dr_mode = "peripheral"; -+ disable-over-current; -+ tpl-support; -+ status = "okay"; -+}; -+ -+&usbotg2 { -+ dr_mode = "host"; -+ disable-over-current; -+ tpl-support; -+ status = "okay"; -+}; -diff --git a/arch/arm/boot/dts/imx6ull-usbarmory.dts b/arch/arm/boot/dts/imx6ull-usbarmory.dts -new file mode 100644 -index 000000000000..f74d0296d5f6 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6ull-usbarmory.dts -@@ -0,0 +1,257 @@ -+/* -+ * USB armory Mk II device tree file -+ * https://github.com/inversepath/usbarmory -+ * -+ * Copyright (C) 2019, F-Secure Corporation -+ * Andrej Rosano -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "imx6ul.dtsi" -+ -+/ { -+ model = "F-Secure USB armory Mk II"; -+ compatible = "inversepath,imx6ull-usbarmory-mkII", "fsl,imx6ull"; -+ -+ chosen { -+ stdout-path = &uart2; -+ }; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x80000000 0x20000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_led>; -+ -+ led-white { -+ label = "LED_WHITE"; -+ gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ -+ led-blue { -+ label = "LED_BLUE"; -+ gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ regulators { -+ compatible = "simple-bus"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ reg_sd1_vmmc: sd1_regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "VSD_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ }; -+}; -+ -+/* Delete CAAM node in AIPS-2 (i.MX6UL specific) */ -+/delete-node/ &crypto; -+ -+&cpu0 { -+ operating-points = < -+ /* kHz uV */ -+ 900000 1275000 -+ 792000 1225000 -+ 528000 1175000 -+ 396000 1025000 -+ 198000 950000 -+ >; -+ fsl,soc-operating-points = < -+ /* KHz uV */ -+ 900000 1250000 -+ 792000 1175000 -+ 528000 1175000 -+ 396000 1175000 -+ 198000 1175000 -+ >; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_bluetooth>; -+ uart-has-rtscts; -+ status = "okay"; -+}; -+ -+&uart2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart2>; -+ status = "okay"; -+}; -+ -+&usdhc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc1>; -+ no-1-8-v; -+ keep-power-in-suspend; -+ wakeup-source; -+ status = "okay"; -+}; -+ -+&usdhc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc2>; -+ non-removable; -+ status = "okay"; -+}; -+ -+&i2c1 { -+ pinctrl-0 = <&pinctrl_i2c1>; -+ status = "okay"; -+}; -+ -+&iomuxc { -+ pinctrl_uart2: uart2grp { -+ fsl,pins = < -+ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1 -+ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1 -+ >; -+ }; -+ -+ pinctrl_bluetooth: uart1grp { -+ fsl,pins = < -+ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b0 /* BT_UART_TX */ -+ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b0 /* BT_UART_RX */ -+ MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS 0x1b0b0 /* BT_UART_CTS */ -+ MX6UL_PAD_GPIO1_IO07__UART1_DCE_RTS 0x130b0 /* BT_UART_RTS */ -+ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x1f020 /* BT_UART_DSR */ -+ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10020 /* BT_UART_DTR */ -+ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x1f020 /* BT_SWDCLK */ -+ MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1f020 /* BT_SWDIO */ -+ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1f020 /* BT_RESET */ -+ MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x1f020 /* BT_SWITCH_1 */ -+ MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x1f020 /* BT_SWITCH_2 */ -+ >; -+ }; -+ -+ pinctrl_i2c1: i2c1grp { -+ fsl,pins = < -+ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0 -+ MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0 -+ >; -+ }; -+ -+ pinctrl_led: ledgrp { -+ fsl,pins = < -+ MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x1f020 -+ MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x1f020 -+ >; -+ }; -+ -+ pinctrl_usdhc1: usdhc1grp { -+ fsl,pins = < -+ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x1f019 -+ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x1f019 -+ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x1f019 -+ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x1f019 -+ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x1f019 -+ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x1f019 -+ >; -+ }; -+ -+ pinctrl_usdhc2: usdhc2grp { -+ fsl,pins = < -+ MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10071 -+ MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 -+ MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 -+ MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 -+ MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 -+ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 -+ MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 -+ MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 -+ MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 -+ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 -+ >; -+ }; -+}; -+ -+/ { -+ soc { -+ aips3: aips-bus@02200000 { -+ compatible = "fsl,aips-bus", "simple-bus"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ reg = <0x02200000 0x100000>; -+ ranges; -+ -+ dcp: dcp@02280000 { -+ compatible = "fsl,imx6ull-dcp", "fsl,imx6sl-dcp", "fsl,imx28-dcp"; -+ reg = <0x02280000 0x4000>; -+ interrupts = , -+ , -+ ; -+ clocks = <&clks IMX6ULL_CLK_DCP_CLK>; -+ clock-names = "dcp"; -+ }; -+ -+ rngb: rngb@02284000 { -+ compatible = "fsl,imx6sl-rng", "fsl,imx25-rngb", "fsl,imx-rng", "imx-rng"; -+ reg = <0x02284000 0x4000>; -+ interrupts = ; -+ clocks = <&clks IMX6UL_CLK_DUMMY>; -+ }; -+ }; -+ }; -+}; -+ -+&usbotg1 { -+ dr_mode = "peripheral"; -+ disable-over-current; -+ tpl-support; -+ status = "okay"; -+}; -+ -+&usbotg2 { -+ dr_mode = "host"; -+ disable-over-current; -+ tpl-support; -+ status = "okay"; -+}; --- -2.37.0 - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index a06752f..bc71aec 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -14,11 +14,9 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre -pkgver=6.3.3 +pkgver=6.6.8 pkgrel=1 pkgdesc='Linux-libre' -rcnver=5.18.12 -rcnrel=armv7-x8 url='https://linux-libre.fsfla.org/' arch=(i686 x86_64 armv7h) license=(GPL2) @@ -26,10 +24,10 @@ makedepends=( bc cpio gettext - git libelf pahole perl + python tar xz @@ -38,18 +36,17 @@ makedepends=( imagemagick python-sphinx texlive-latexextra - xmlto ) makedepends_armv7h=(uboot-tools vboot-utils dtc) # required by linux-libre-chromebook options=('!strip') -_srcname=linux-6.3 +_srcname=linux-6.6 source=( "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} "https://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign} "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig} config.i686 config.x86_64 config.armv7h # the main kernel config files linux-armv7h.preset # armv7h preset file for mkinitcpio ramdisk - "kernel"{.its,.keyblock,_data_key.vbprivk} # files for signing Chromebooks kernels + "kernel"{.its,.keyblock,_data_key.vbprivk} # files for signing veyron Chromebook kernels # maintain the TTY over USB disconnects # http://www.coreboot.org/EHCI_Gadget_Debug @@ -60,34 +57,59 @@ source=( 0002-fix-Atmel-maXTouch-touchscreen-support.patch # Arch Linux patches 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch + 0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch ) source_i686=( # avoid using zstd compression in ultra mode (exhausts virtual memory) no-ultra-zstd.patch ) source_armv7h=( - # RCN patch (CM3 firmware deblobbed and bloatware removed) - #"https://repo.parabola.nu/other/rcn-libre/patches/$rcnver/rcn-libre-$rcnver-$rcnrel.patch"{,.sig} # Arch Linux ARM patches 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch 0003-fix-mvsdio-eMMC-timing.patch 0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch - 0005-set-default-cubietruck-led-triggers.patch - 0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch - 0007-USB-Armory-MkII-support.patch + #0005-set-default-cubietruck-led-triggers.patch + #0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch + #0007-USB-Armory-MkII-support.patch # ChromiumOS patch # https://labs.parabola.nu/issues/2372 0001-CHROMIUM-block-partitions-efi-Add-support-for-IGNORE.patch ) validpgpkeys=( - '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P. + 474402C8C582DAFBE389C427BCB7CF877E7D47A7 # Alexandre Oliva + 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 # David P. ) -b2sums=('03c5869a2b432207208d002a3a8b55f42751dc2b50642fcd9ca982cc8da05c7965d359202e49e1418b0ff74307fdeb91d9f41f3293815bc4e508a43104ec1e92' +sha256sums=('d71785bdb694fefaa4f183e5dd2ffc453c179db6f9427cc37e1ed046f0073ccf' + 'SKIP' + '4193aba41ae2eed56059b7fe917fa0b933573578b7a71f4e0fdb7a4487075170' + 'SKIP' + 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' + 'SKIP' + '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' + 'SKIP' + '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' + 'SKIP' + '0e4aed294e60fc9ac397cff327a8b549e672d423bf71e4a2e53c62d36c60701c' + '62ddc229b843688d3b87d2bf17dcd49d718971b20307d9262bd1b6fc15ce9112' + 'b66961f28d8e01d4c0cb6bf9df6cc3edc89c7a3369f44bb718ff6a1d77f6fd74' + 'ca1708abbd2f8960c278722dc81a7c635973d92872386ad9e2fff10b86836e98' + '523d52a6fc9df4c43c8401f17cd796ebd281845d05358c9564a64d8c5a63f028' + '4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb' + 'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b' + '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' + '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25' + 'f42b4d1cbde46fd9c2e3b9baaecb0a50fab3aa423a621a7849c42b5ddbbfa9b8' + '1ee62f3e582ffb63323097ff0698572b33507d1ff3dd3c88f7071dfa7a22fc24') +sha256sums_i686=('d32270be5fd9c3e3ba50f3aef33f6cfcb85be0c8216f03b777287cc621fdff28') +sha256sums_armv7h=('ef4661a32234fe12bda28e698400c78c11491387df83ee554c53afb4dba244da' + 'd3a4b7c7a3d3b4d69369b85630eef33b21cfbcffc23adbdc3cfa837610912287' + '2bce52fa4ae4d34ca171d3aa100302a920c231275fc3ba9141af8b2f68cf67d1' + '12d5706b00d2939b92130a4dc41d060f5e1fea75424b902ebceca72e427dc3b9' + 'f4d4b44adc4b47b18bac33aa2c46b458c1b7ceb277416eff59054b6d7687c6da') +b2sums=('e3e753fed07258f34e2e44e1acd4be0c22a3c58a3ae4856b518a4f99358f5bf6e8f38e41f422d9a434b33b0d7ee972e93ac7d37c9734949d6db263afe4c4f47c' 'SKIP' - 'cff40934db0b5da1624718bab083fc7e99418ee1f134fbb5d52f47927e32198fdc5117d1e8464dc86f504ce8dc1ad924dff6eb87f7cf844ef7b35861aa2a40c8' + '53cb120b0bc8bce90e19fce0a69d05ab3f69d07ce75976d2106e0edaf5699fb71f777b1913c1fc36075d9dc46d3f4bfa1f9e4f2e7901bae869c28d3642a0a93e' 'SKIP' '73fee2ae5cb1ffd3e6584e56da86a8b1ff6c713aae54d77c0dab113890fc673dc5f300eb9ed93fb367b045ece8fa80304ff277fe61665eccf7b7ce24f0c045eb' 'SKIP' @@ -95,25 +117,22 @@ b2sums=('03c5869a2b432207208d002a3a8b55f42751dc2b50642fcd9ca982cc8da05c7965d3592 'SKIP' '580911af9431c066bbc072fd22d5e2ef65f12d8358cec5ff5a4f1b7deebb86cef6b5c1ad631f42350af72c51d44d2093c71f761234fb224a8b9dbb3b64b8201d' 'SKIP' - '84f65302f45c83e28cb5204a9b6fcbf652dab3d535702b1fd84ff8af973de7e8edbe92ce58052c10c8bf4414856205785a88d76ac76eb524e36b7644d3f1f226' - 'aeb684b13d3ea869996f7af04211f2c35398441532ff8238885cb5ebd1c4ff22c6afaaf8d18794626af77d85345e7d8c89658504faed70afe634acc44be926e0' + '196423ae81a8c359db0c70888b3117d126594699ddbf3033c69c5c2aba02d20f7349a48b9d8095c7d398024b10ef1f89f12b59421074cd57ac74d9462b0457d0' + 'afcb497e56fced76d797caee65a223ac59925d33514b79d5384f4b114647936791fe3cb77982fb2d88cfc47194e16f99d38ff6ee08c2d24ad70452238dcb26fa' '5760e0879cf71dfc1c9bdd557829f28437909e701fa566cc3575a52785c81ac70d634ec929833ac01aea111bbae6ba402add738dc86623b32bcc3b523d43f60f' 'af69176b1117b94e56b043e97b0bd5873a2974a6a2fd52b102d0ffdca440ff68cfb241d6c4d4ef453cc8c220c236b739bad232e53fd500ce7672fa6e5ba87383' - 'f2d309c1d0a347539a8095223085691a9be228934b2258feb4872784f6cf6c2cc741426e4e755d63128ee57c284eddb13e0c719d4b5f8e101722e4cca4eb3ad5' + '9336fb5d1f98a77144673750b0f924b15b60e98e4bba0d13d1b1a5c977f14538f97143147081c94e0d8555b5dbd246fe0a410c7146a9b0866f3728176548fb0a' 'eeed12b2ab60c3d3aad598a1d44b4f23560d818e8fe1ef143f857c8e176652df53501b192ade7d4d915d425fff818b2a232d46bae0d3a0f46b8959e614e0ede2' 'aaa4e28a31967cc3a7fe25a86ba35fdfa210cd8b1a9cc96298349cbf01d60cdf146ee519d6803d05b175873f1b3367e47194a178db7ed97c802e59b38f8c303c' 'c2214154c36900e311531bfe68184f31639f5c50fed23bc3803a7f18439b7ff258552a39f02fed0ea92f10744e17a6c55cef0ef1a98187f978fe480fb3dddc14' '0c7ceba7cd90087db3296610a07886f337910bad265a32c052d3a703e6eb8e53f355ab9948d72d366408d968d8ee7435084dd89bef5ed0b69355fd884c2cd468' - '25b35ceabee03a287f21e7de5907fa760ad63e2e5125ee2c42fb8e4427c5fca1bd62be0bef32a1d46b649b513bb3f892337cc1413768440fe9e9613c51d0f8e3' - '9c7f23cc063ab6c8878e2785bf415320df1e41687db3e35e99286416d59f4c923b1a8bcf6cd0e51d9e689b063c49451bb765d18b47b9139990c8f5b01710783b') + '4f5df7bb477f09855294fd4afd6adedd97f1a96051d350a936cb3e061de9c599130e9db4a820d5b70086b8fac5e9e294ca2898fa924310c4fae684c2fbf9c5bc' + '9419a4ff2104313df9e40cd1e7f3f7629b4beec27e60b27c4935bb57a245c7b63189ffe38a70ca834d025708c489c623f2734a0e0b3260dde14e871c52455911') b2sums_i686=('165ab9dd8cedeaae5327accc1581c19cf0be55f923b03feb889cad3351b74c7c4cd3d3c206938e5152bfe1d947513dea8f630f8f5544099ec13d16d254725c40') b2sums_armv7h=('73ecc5862c6b4aef7b163c1992004273fbf791b82c75a8602e3def311f682f2b866124c0bfde90d03c7c76bb8b5853bdb9daad6ee2ab0908f4145cda476b8286' '15f7b70b5d153e9336006aba873a78f94d91b8df5e1939041f12e678bb9cfbdda2e362001068a07c044ce606cf0d4d2e625002df9c569c914f7ac248d4d3e8ad' '6219cec826bc543000ab87cf35dcc713f0635519cf79e75888b213a5e2d1f728e59e70df7fd842dda6e40494bf9cafa9f87368cb75b338c5a157a0adcf583512' '66d6cff292962c4c8bbea62b2240c4c53c0c514f9e99864be9244cb846c505e1bedd800ca1347b80883543035d20573b06796e5bacbace6e829880695ffca781' - 'e1d0949abbde146d68cddab53944c0391210fb4ac632a78788ec729dea834cb82698c8beef203608eee5323a07ecd566b9813552498e9ac659942060713c4549' - '56fdf81b439b6b94e63acfb18d61f90298dc4e29fc65efd4dcf41ae950e87f287f48b42b2be15f4ea0cf7a6d39df3c0ef882cf37b2474e91cc2985fb6cdd1089' - 'd00505c1ac57fd4b53bdb0d9a2172168a23d6082111695c679aeae58e8e749f5b2ef27ce1bc47b0d5fdd81fac792c57d9b45f125a3315b64297b146f727ac467' '741ad7ffc9e8200657315fc4111066b2477cde35ecdc5e73976457f17106f80d148d86bf97b92c523fef1cc5a26ddb867d16330f592f2aa4d886be596bedc8df') _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") @@ -129,11 +148,6 @@ export KBUILD_BUILD_HOST=parabola export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" -_make() { - test -s version - make KERNELRELEASE="$( localversion.10-pkgrel echo "${pkgbase#linux-libre}" > localversion.20-pkgname - make defconfig - make -s kernelrelease > version - make mrproper - if [ "$CARCH" = "armv7h" ]; then - local src_armv7h - for src_armv7h in "${source_armv7h[@]}"; do - src_armv7h="${src_armv7h%%::*}" - src_armv7h="${src_armv7h##*/}" - [[ $src_armv7h = *.patch ]] || continue - echo "Applying patch $src_armv7h..." - patch -Np1 < "../$src_armv7h" - done - fi - - if [ "$CARCH" = "i686" ]; then - local src_i686 - for src_i686 in "${source_i686[@]}"; do - src_i686="${src_i686%%::*}" - src_i686="${src_i686##*/}" - [[ $src_i686 = *.patch ]] || continue - echo "Applying patch $src_i686..." - patch -Np1 < "../$src_i686" - done - fi + local source_all + case "$CARCH" in + "armv7h") + source_all+=("${source_armv7h[@]}") ;; + "i686") + source_all+=("${source_i686[@]}") ;; + esac + source_all+=("${source[@]}") local src - for src in "${source[@]}"; do + for src in "${source_all[@]}"; do src="${src%%::*}" src="${src##*/}" + src="${src%.zst}" [[ $src = *.patch ]] || continue echo "Applying patch $src..." patch -Np1 < "../$src" @@ -186,15 +185,21 @@ prepare() { echo "Setting config..." cp ../config.$CARCH .config - _make olddefconfig + make olddefconfig diff -u ../config.$CARCH .config || : + make -s kernelrelease > version echo "Prepared $pkgbase version $( Date: Dec 31 2023 06:38:34 +0000 Subject: [PATCH 7/73] [lolcat]: rebuilds against latest 'ruby-optimist' --- diff --git a/libre/lolcat/PKGBUILD b/libre/lolcat/PKGBUILD index f55f7c1..b1a96ab 100644 --- a/libre/lolcat/PKGBUILD +++ b/libre/lolcat/PKGBUILD @@ -3,16 +3,16 @@ # Contributor: bill-auger # parabola changes and rationale: -# - install "un-packaged" to avoid the 'rubygems' dependency +# - install "un-packaged" (aka: de-pipped), to avoid the 'rubygems' dependency # NOTE: don't bother to diff this against arch - this required a total re-write pkgname=lolcat pkgver=100.0.1 -_gems_ver=3.0.0 # -> /usr/lib/ruby/gems/3.0.0/ -_optimist_ver=3.0.1 -_paint_ver=2.3.0 -pkgrel=1.parabola1 +_gems_ver=3.0.0 # -> /usr/lib/ruby/gems/${_gems_ver}/ +_optimist_ver=3.1.0 # $ pacman -S ruby-optimist --print-format=%v | cut -d '-' -f 1 +_paint_ver=2.3.0 # $ pacman -S ruby-paint --print-format=%v | cut -d '-' -f 1 +pkgrel=1.parabola2 pkgdesc='Rainbows and unicorns! Okay, no unicorns. But rainbows!!' url=https://github.com/busyloop/lolcat arch=(any) From 6df95ef088cac4f682f07db2ac4859fccadfffd7 Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Dec 31 2023 06:39:04 +0000 Subject: [PATCH 8/73] Updated lagrange to v1.17.5 --- diff --git a/pcr/lagrange/PKGBUILD b/pcr/lagrange/PKGBUILD index 6989d53..5d0b722 100644 --- a/pcr/lagrange/PKGBUILD +++ b/pcr/lagrange/PKGBUILD @@ -6,13 +6,13 @@ pkgname=lagrange pkgrel=1 -pkgver=1.17.3 +pkgver=1.17.5 pkgdesc="Beautiful Gemini Client" url="https://gmi.skyjake.fi/lagrange/" arch=('x86_64' 'i686' 'aarch64' 'armv7h') license=("BSD2") source=("https://git.skyjake.fi/skyjake/$pkgname/releases/download/v$pkgver/lagrange-$pkgver.tar.gz") -sha256sums=('cd0c4797e399082ccbf4d0ede939ef286b96863c31860f62387fd94275dda3ba') +sha256sums=('01ae2066a6865f0f861c5e159f192eb120c1b36b04d032cd0bfcf2ffcbd990e0') depends=( "fribidi" From 5ff0f2d178989ad803731ecf3d776b6b94685101 Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Dec 31 2023 06:39:20 +0000 Subject: [PATCH 9/73] Update unifont, commented out TTF compilation as it seems to be somewhat broken. --- diff --git a/pcr/unifont/PKGBUILD b/pcr/unifont/PKGBUILD index 5894a6c..0f05679 100644 --- a/pcr/unifont/PKGBUILD +++ b/pcr/unifont/PKGBUILD @@ -27,11 +27,11 @@ pkgname=('pcf-unifont' 'psf-unifont' 'hex-unifont' 'bdf-unifont' - 'ttf-unifont' +# 'ttf-unifont' 'otf-unifont' 'unifont-utils') pkgbase=unifont -pkgver=15.0.06 +pkgver=15.1.04 pkgrel=1 pkgdesc="A free bitmap font with wide Unicode support (PCF, PSF and hex versions)" arch=('any') @@ -39,7 +39,7 @@ arch=('any') url="http://unifoundry.com/" license=('GPL' 'custom:OFL') source=("http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"{,.sig}) -sha256sums=('36668eb1326d22e1466b94b3929beeafd10b9838bf3d41f4e5e3b52406ae69f1' +sha256sums=('4a0a481c06338543399f5130cb50cbec6b73eeff6b3466f72891c38cbe1c5cf7' 'SKIP') validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy From 5bb955a4754fa6a1efe55b28f42481758fac1f67 Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Dec 31 2023 06:39:54 +0000 Subject: [PATCH 10/73] Updated memlockd to 1.3, fixed small issue with systemd service path. --- diff --git a/pcr/memlockd/PKGBUILD b/pcr/memlockd/PKGBUILD index c62e7ed..7274023 100644 --- a/pcr/memlockd/PKGBUILD +++ b/pcr/memlockd/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Wael Karram pkgname=memlockd -pkgver=1.2 +pkgver=1.3 pkgrel=1 pkgdesc="daemon that locks files into memory" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://doc.coker.com.au/projects/memlockd/" license=('GPL3') depends=('glibc') source=(http://www.coker.com.au/memlockd/memlockd_${pkgver}.tar.gz) -sha256sums=('3b99fd33793b5b870519189a4640f7b06601dd24e727b466a5c26c6bf0b7ac3a') +sha256sums=('048f7762b382f44d62242ef6d11f6adfcdf78181b08f8e1f9177bf774054cfa4') install=${pkgname}.install backup=(etc/memlockd.cfg) @@ -26,5 +26,6 @@ package() { install -D -m 644 memlockd.8 "${pkgdir}/usr/share/man/man8/memlockd.8" install -D -m 755 memlockd "${pkgdir}/usr/bin/memlockd" install -D -m 640 memlockd.cfg "${pkgdir}/etc/memlockd.cfg" + cd debian install -D -m 644 memlockd.service "${pkgdir}/usr/lib/systemd/system/memlockd.service" } From 26607b4f09fb4ef9ac4f2fb4ac6066c6193b5185 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Dec 31 2023 06:40:32 +0000 Subject: [PATCH 11/73] [unifont]: housekeeping --- diff --git a/pcr/unifont/PKGBUILD b/pcr/unifont/PKGBUILD index 0f05679..957f731 100644 --- a/pcr/unifont/PKGBUILD +++ b/pcr/unifont/PKGBUILD @@ -20,14 +20,17 @@ # In order to publish all of these packages, `librestage` must be run twice. # The first run will stage the 'any' packages. # In order to librestage the per-arch 'unifont-utils' and source packages, -# uncomment the commented arch=() array temporarily. +# uncomment the commented arch=() array temporarily, and run librestage again. +# TODO: There is a WIP in librestage which adds a CLI option to specifiy arches. +# Once that is released, this note can be changed to suggest a single command +# eg: librestage -A '.*' pkgname=('pcf-unifont' 'psf-unifont' 'hex-unifont' 'bdf-unifont' -# 'ttf-unifont' +# 'ttf-unifont' # v15.1.04 fails to build 'otf-unifont' 'unifont-utils') pkgbase=unifont From cca593ef87536b982f87478ffccb6b9ff51f2f6c Mon Sep 17 00:00:00 2001 From: bill-auger Date: Dec 31 2023 06:40:45 +0000 Subject: [PATCH 12/73] [unifont]: list all contributors for diffing --- diff --git a/pcr/unifont/PKGBUILD b/pcr/unifont/PKGBUILD index 957f731..b056b05 100644 --- a/pcr/unifont/PKGBUILD +++ b/pcr/unifont/PKGBUILD @@ -1,14 +1,24 @@ # Maintainer: Wael Karram -# Maintainer (aur): neeshy -# Contributor: Carlos Aznarán -# Contributor: Martin C. Doege -# Contributor: Gregory G Danielson III +# Contributor: bill-auger +# bdf-unifont: +# Maintainer (aur:bdf-unifont): Carlos Aznarán +# Contributor: Antonio Rojas +# Contributor: Ronald van Haren +# hex-unifont: +# (no package, but is built from 'ttf-unifont' recipe) +# otf-unifont: +# Maintainer (aur:otf-unifont): Martin C. Doege +# Maintainer (aur:otf-unifont): txtsd # Contributor: nl6720 # Contributor: David McInnis # Contributor: megadriver -# Contributor: Antonio Rojas -# Contributor: Ronald van Haren -# Contributor: felix <`base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg`> +# pcf-unifont: +# Maintainer (aur:pcf-unifont): neeshy +# psf-unifont: +# Maintainer (aur:psf-unifont): neeshy +# ttf-unifont: +# Maintainer (aur:ttf-unifont): txtsd +# Maintainer (aur:ttf-unifont): Martin C. Doege # parabola changes and rationale: From 53e72ad34ee3232d9c5334c08b437dd2b2bb24da Mon Sep 17 00:00:00 2001 From: bill-auger Date: Dec 31 2023 06:40:57 +0000 Subject: [PATCH 13/73] [unifont]: alphabetize pkgnames and package_* functions --- diff --git a/pcr/unifont/PKGBUILD b/pcr/unifont/PKGBUILD index b056b05..be0f497 100644 --- a/pcr/unifont/PKGBUILD +++ b/pcr/unifont/PKGBUILD @@ -36,12 +36,12 @@ # eg: librestage -A '.*' -pkgname=('pcf-unifont' - 'psf-unifont' +pkgname=('bdf-unifont' 'hex-unifont' - 'bdf-unifont' -# 'ttf-unifont' # v15.1.04 fails to build 'otf-unifont' + 'pcf-unifont' + 'psf-unifont' +# 'ttf-unifont' # v15.1.04 fails to build 'unifont-utils') pkgbase=unifont pkgver=15.1.04 @@ -67,12 +67,13 @@ build() { make } -package_pcf-unifont() { - pkgdesc="A free bitmap font with wide Unicode support (PCF version)" +package_bdf-unifont () { + pkgdesc="A free bitmap font with wide Unicode support (BDF version)" # Install the font. cd "$srcdir/unifont-$pkgver/font/precompiled" - install -Dm644 "unifont-$pkgver.pcf.gz" "$pkgdir/usr/share/fonts/misc/unifont.pcf.gz" + gzip -d --force "unifont-$pkgver.bdf.gz" + install -Dm644 "unifont-$pkgver.bdf" "$pkgdir/usr/share/fonts/misc/unifont.bdf" # Install the license. cd "$srcdir/unifont-$pkgver" install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -81,12 +82,12 @@ package_pcf-unifont() { install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -package_psf-unifont() { - pkgdesc="A free bitmap font with wide Unicode support (PSF version)" +package_hex-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (hex version)" # Install the font. cd "$srcdir/unifont-$pkgver/font/precompiled" - install -Dm644 "Unifont-APL8x16-$pkgver.psf.gz" "$pkgdir/usr/share/kbd/consolefonts/Unifont-APL8x16.psf.gz" + install -Dm644 "unifont-$pkgver.hex" "$pkgdir/usr/share/unifont/unifont.hex" # Install the license. cd "$srcdir/unifont-$pkgver" install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -95,12 +96,16 @@ package_psf-unifont() { install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -package_hex-unifont() { - pkgdesc="A free bitmap font with wide Unicode support (hex version)" +package_otf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (OTF version)" # Install the font. cd "$srcdir/unifont-$pkgver/font/precompiled" - install -Dm644 "unifont-$pkgver.hex" "$pkgdir/usr/share/unifont/unifont.hex" + install -d "$pkgdir/usr/share/fonts/Unifont/" + install -m644 "unifont-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont.otf" + install -m644 "unifont_jp-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.otf" + install -m644 "unifont_upper-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.otf" + install -m644 "unifont_csur-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.otf" # Install the license. cd "$srcdir/unifont-$pkgver" install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -109,13 +114,12 @@ package_hex-unifont() { install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -package_bdf-unifont () { - pkgdesc="A free bitmap font with wide Unicode support (BDF version)" +package_pcf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (PCF version)" # Install the font. cd "$srcdir/unifont-$pkgver/font/precompiled" - gzip -d --force "unifont-$pkgver.bdf.gz" - install -Dm644 "unifont-$pkgver.bdf" "$pkgdir/usr/share/fonts/misc/unifont.bdf" + install -Dm644 "unifont-$pkgver.pcf.gz" "$pkgdir/usr/share/fonts/misc/unifont.pcf.gz" # Install the license. cd "$srcdir/unifont-$pkgver" install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -124,16 +128,12 @@ package_bdf-unifont () { install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -package_ttf-unifont() { - pkgdesc="A free bitmap font with wide Unicode support (TTF version)" +package_psf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (PSF version)" # Install the font. cd "$srcdir/unifont-$pkgver/font/precompiled" - install -d "$pkgdir/usr/share/fonts/Unifont/" - install -m644 "unifont-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont.ttf" - install -m644 "unifont_jp-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.ttf" - install -m644 "unifont_upper-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.ttf" - install -m644 "unifont_csur-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.ttf" + install -Dm644 "Unifont-APL8x16-$pkgver.psf.gz" "$pkgdir/usr/share/kbd/consolefonts/Unifont-APL8x16.psf.gz" # Install the license. cd "$srcdir/unifont-$pkgver" install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -142,16 +142,16 @@ package_ttf-unifont() { install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -package_otf-unifont() { - pkgdesc="A free bitmap font with wide Unicode support (OTF version)" +package_ttf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (TTF version)" # Install the font. cd "$srcdir/unifont-$pkgver/font/precompiled" install -d "$pkgdir/usr/share/fonts/Unifont/" - install -m644 "unifont-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont.otf" - install -m644 "unifont_jp-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.otf" - install -m644 "unifont_upper-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.otf" - install -m644 "unifont_csur-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.otf" + install -m644 "unifont-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont.ttf" + install -m644 "unifont_jp-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.ttf" + install -m644 "unifont_upper-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.ttf" + install -m644 "unifont_csur-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.ttf" # Install the license. cd "$srcdir/unifont-$pkgver" install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" From 9050174f1d57cb3f4c602fceb1faf14c31a7ae75 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Dec 31 2023 06:41:08 +0000 Subject: [PATCH 14/73] [memlockd]: add armv7h support --- diff --git a/pcr/memlockd/PKGBUILD b/pcr/memlockd/PKGBUILD index 7274023..c294800 100644 --- a/pcr/memlockd/PKGBUILD +++ b/pcr/memlockd/PKGBUILD @@ -6,7 +6,7 @@ pkgname=memlockd pkgver=1.3 pkgrel=1 pkgdesc="daemon that locks files into memory" -arch=('i686' 'x86_64') +arch=('armv7h' 'i686' 'x86_64') url="http://doc.coker.com.au/projects/memlockd/" license=('GPL3') depends=('glibc') From a0fff3f88a17d7e34b62ba8009aa7e8da9fa5a01 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Dec 31 2023 06:58:38 +0000 Subject: [PATCH 15/73] [memlockd]: minimize diff against AUR --- diff --git a/pcr/memlockd/PKGBUILD b/pcr/memlockd/PKGBUILD index c294800..f0324e7 100644 --- a/pcr/memlockd/PKGBUILD +++ b/pcr/memlockd/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer (aur): Giancarlo Razzolini # Contributor: fauno # Maintainer: Parabola Hackers # Contributor: Wael Karram @@ -6,22 +7,24 @@ pkgname=memlockd pkgver=1.3 pkgrel=1 pkgdesc="daemon that locks files into memory" -arch=('armv7h' 'i686' 'x86_64') -url="http://doc.coker.com.au/projects/memlockd/" +arch=('i686' 'x86_64') +arch=('armv7h') +url="https://doc.coker.com.au/projects/memlockd/" license=('GPL3') depends=('glibc') -source=(http://www.coker.com.au/memlockd/memlockd_${pkgver}.tar.gz) -sha256sums=('048f7762b382f44d62242ef6d11f6adfcdf78181b08f8e1f9177bf774054cfa4') -install=${pkgname}.install backup=(etc/memlockd.cfg) +install=memlockd.install +source=($pkgname-$pkgver.tar.gz::https://www.coker.com.au/$pkgname/$pkgname\_$pkgver.tar.gz +) +sha256sums=('048f7762b382f44d62242ef6d11f6adfcdf78181b08f8e1f9177bf774054cfa4') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" install -d -m 750 "${pkgdir}/usr/lib/memlockd" "${pkgdir}/etc/memlockd.d" install -D -m 644 memlockd.8 "${pkgdir}/usr/share/man/man8/memlockd.8" install -D -m 755 memlockd "${pkgdir}/usr/bin/memlockd" From f3081e629404a780eaa1c6362e626405f6fb22ac Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Dec 31 2023 06:58:49 +0000 Subject: [PATCH 16/73] Updated inspircd to 3.17.0 --- diff --git a/pcr/inspircd/PKGBUILD b/pcr/inspircd/PKGBUILD index f216220..ae1cbcb 100644 --- a/pcr/inspircd/PKGBUILD +++ b/pcr/inspircd/PKGBUILD @@ -1,6 +1,5 @@ # Maintainer (aur): Maxime Poulin # Maintainer (aur): Felix Golatofski -# Contributor: Christian Pfeiffer # Contributor: Damian Nowak # Contributor: Kyle Fuller # Contributor: jibi @@ -8,7 +7,7 @@ pkgname='inspircd' -pkgver='3.16.1' +pkgver='3.17.0' pkgrel='1' pkgdesc='InspIRCd is a modular Internet Relay Chat (IRC) server written in C++ for Linux, BSD, Windows and macOS systems.' arch=('x86_64' 'aarch64') @@ -39,7 +38,7 @@ source=("https://github.com/inspircd/inspircd/archive/v$pkgver.tar.gz" "$pkgname.service" "$pkgname.sysusers" ) -sha256sums=('cee0eca7b0c91ac0665199fdfb8ed4edb436a08b8b850b35e19da607c102aec0' +sha256sums=('181de90130e11a26ec107fcb6b74005cbce3051b89b500347e416054e29c3166' 'b59bbb46ed411ad4f39f04539ea3957f3d029c4a2f8994769eb775b17a804351' 'cab41d386b4207e967b8fc5ab6859e20b342fd91c7e55a20eac856b8ab6cdf8c') From 4dfe71a4e27cb99475a6b9badb6243e13f38a2e4 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 01 2024 20:04:21 +0000 Subject: [PATCH 17/73] [linux-libre-vanilla]: bugfix optdepends --- diff --git a/libre/linux-libre-vanilla/PKGBUILD b/libre/linux-libre-vanilla/PKGBUILD index 8156474..72eb8a8 100644 --- a/libre/linux-libre-vanilla/PKGBUILD +++ b/libre/linux-libre-vanilla/PKGBUILD @@ -163,7 +163,7 @@ _package() { ) optdepends=( 'wireless-regdb: to set the correct wireless channels of your country' - 'linux-libre-firmware: firmware images needed for some devices' + 'linux-firmware: firmware images needed for some devices' ) optdepends=( "${optdepends[@]/linux/linux-libre}" ) # minimize diff provides=( From 81cc824643d83f4eb8d203dd4e3515238e98e97c Mon Sep 17 00:00:00 2001 From: David P Date: Jan 03 2024 00:39:41 +0000 Subject: [PATCH 18/73] updpkg: libre/linux-libre-zen 6.6.8.zen1-1 Signed-off-by: David P. --- diff --git a/libre/linux-libre-zen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/libre/linux-libre-zen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch new file mode 100644 index 0000000..d4c3cf0 --- /dev/null +++ b/libre/linux-libre-zen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -0,0 +1,51 @@ +From 4533007cef1bd1da546752b372234b9bb9548214 Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Sun, 2 Dec 2012 19:59:28 +0100 +Subject: [PATCH 1/7] ARM: atags: add support for Marvell's u-boot + +Marvell uses a specific atag in its u-boot which includes among other +information the MAC addresses for up to 4 network interfaces. + +Signed-off-by: Willy Tarreau +--- + arch/arm/include/uapi/asm/setup.h | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h +index 25ceda63b284..83578c54975b 100644 +--- a/arch/arm/include/uapi/asm/setup.h ++++ b/arch/arm/include/uapi/asm/setup.h +@@ -144,6 +144,18 @@ struct tag_memclk { + __u32 fmemclk; + }; + ++/* Marvell uboot parameters */ ++#define ATAG_MV_UBOOT 0x41000403 ++struct tag_mv_uboot { ++ __u32 uboot_version; ++ __u32 tclk; ++ __u32 sysclk; ++ __u32 isUsbHost; ++ __u8 macAddr[4][6]; ++ __u16 mtu[4]; ++ __u32 nand_ecc; ++}; ++ + struct tag { + struct tag_header hdr; + union { +@@ -166,6 +178,11 @@ struct tag { + * DC21285 specific + */ + struct tag_memclk memclk; ++ ++ /* ++ * Marvell specific ++ */ ++ struct tag_mv_uboot mv_uboot; + } u; + }; + +-- +2.37.0 + diff --git a/libre/linux-libre-zen/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/libre/linux-libre-zen/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch new file mode 100644 index 0000000..e9de435 --- /dev/null +++ b/libre/linux-libre-zen/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch @@ -0,0 +1,39 @@ +From 716120e8010a7f400c6bed7384000e95e1465c94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= +Date: Mon, 26 Aug 2013 19:19:44 +0300 +Subject: [PATCH 1/2] usb serial gadget: no TTY hangup on USB disconnect [WIP] +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We may want to maintain the TTY over USB disconnects. + +This is useful when we have a terminal console to a host which +power-cycles or for other reasons resets the USB host controller. + +Signed-off-by: Kyösti Mälkki +--- + drivers/usb/gadget/function/u_serial.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c +index b369292..d156a28 100644 +--- a/drivers/usb/gadget/function/u_serial.c ++++ b/drivers/usb/gadget/function/u_serial.c +@@ -1258,8 +1258,13 @@ void gserial_disconnect(struct gserial *gser) + gser->ioport = NULL; + if (port->port.count > 0 || port->openclose) { + wake_up_interruptible(&port->drain_wait); ++#if 0 + if (port->port.tty) + tty_hangup(port->port.tty); ++#else ++ if (port->port.tty) ++ stop_tty(port->port.tty); ++#endif + } + spin_unlock_irqrestore(&port->port_lock, flags); + +-- +1.8.1.1 + diff --git a/libre/linux-libre-zen/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/libre/linux-libre-zen/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch new file mode 100644 index 0000000..758c050 --- /dev/null +++ b/libre/linux-libre-zen/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -0,0 +1,38 @@ +From b2f96ec9b408c8bbec437c3d3b54c0b748fca85a Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Sun, 2 Dec 2012 19:56:58 +0100 +Subject: [PATCH 2/7] ARM: atags/fdt: retrieve MAC addresses from Marvell boot + loader + +The atags are parsed and if a Marvell atag is found, up to 4 MAC +addresses are extracted there and assigned to node aliases eth0..3 +with the name "mac-address". + +This was tested on my Mirabox and the two NICs had their correct +address set. + +Signed-off-by: Willy Tarreau +--- + arch/arm/boot/compressed/atags_to_fdt.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c +index 1feb6b0f7a1f..5e5cb3094b6a 100644 +--- a/arch/arm/boot/compressed/atags_to_fdt.c ++++ b/arch/arm/boot/compressed/atags_to_fdt.c +@@ -205,6 +205,12 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) + hex_str(serno, atag->u.serialnr.high); + hex_str(serno+8, atag->u.serialnr.low); + setprop_string(fdt, "/", "serial-number", serno); ++ } else if (atag->hdr.tag == ATAG_MV_UBOOT) { ++ /* This ATAG provides up to 4 MAC addresses */ ++ setprop(fdt, "eth0", "mac-address", atag->u.mv_uboot.macAddr[0], 6); ++ setprop(fdt, "eth1", "mac-address", atag->u.mv_uboot.macAddr[1], 6); ++ setprop(fdt, "eth2", "mac-address", atag->u.mv_uboot.macAddr[2], 6); ++ setprop(fdt, "eth3", "mac-address", atag->u.mv_uboot.macAddr[3], 6); + } + } + +-- +2.37.0 + diff --git a/libre/linux-libre-zen/0002-fix-Atmel-maXTouch-touchscreen-support.patch b/libre/linux-libre-zen/0002-fix-Atmel-maXTouch-touchscreen-support.patch new file mode 100644 index 0000000..5ad26fc --- /dev/null +++ b/libre/linux-libre-zen/0002-fix-Atmel-maXTouch-touchscreen-support.patch @@ -0,0 +1,37 @@ +From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001 +From: André Silva +Date: Tue, 22 Mar 2016 17:58:59 -0300 +Subject: [PATCH 2/2] fix Atmel maXTouch touchscreen support + +The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu, +but not with the current longterm and mainline kernels in +Parabola. + +Now it needs to load nonfree firmware in mxt_initialize(), +which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the +atmel_mxt_ts driver fails to work. + +This driver works if changing reject_firmware_nowait to +request_firmware_nowait in atmel_mxt_ts.c. This line is +requesting the file named MXT_CFG_NAME, and it's a config file, +not the firmware blob. + +Signed-off-by: André Silva +Signed-off-by: mytbk +--- + drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c +index 726a83e..d818834 100644 +--- a/drivers/input/touchscreen/atmel_mxt_ts.c ++++ b/drivers/input/touchscreen/atmel_mxt_ts.c +@@ -1989,7 +1989,7 @@ static int mxt_initialize(struct mxt_data *data) + if (error) + goto err_free_object_table; + +- error = reject_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, ++ error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, + &client->dev, GFP_KERNEL, data, + mxt_config_cb); + if (error) { diff --git a/libre/linux-libre-zen/0003-fix-mvsdio-eMMC-timing.patch b/libre/linux-libre-zen/0003-fix-mvsdio-eMMC-timing.patch new file mode 100644 index 0000000..a447eaa --- /dev/null +++ b/libre/linux-libre-zen/0003-fix-mvsdio-eMMC-timing.patch @@ -0,0 +1,38 @@ +From 5b76d7e549a6f65f881ef832cb39ae6a4ad34119 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Fri, 5 Sep 2014 15:43:56 -0600 +Subject: [PATCH 3/7] fix mvsdio eMMC timing + +These changes from Globalscale change the MMC timing to allow the eMMC versions +of the Mirabox and SMILE Plug to work. + +Signed-off-by: Kevin Mihelich +--- + drivers/mmc/host/mvsdio.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c +index 629efbe639c4..c507c064736c 100644 +--- a/drivers/mmc/host/mvsdio.c ++++ b/drivers/mmc/host/mvsdio.c +@@ -90,7 +90,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data) + tmout_index = fls(tmout - 1) - 12; + if (tmout_index < 0) + tmout_index = 0; +- if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX) ++// if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX) //by steven, try to setup the timeout to maximum value + tmout_index = MVSD_HOST_CTRL_TMOUT_MAX; + + dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n", +@@ -613,6 +613,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) + u32 m = DIV_ROUND_UP(host->base_clock, ios->clock) - 1; + if (m > MVSD_BASE_DIV_MAX) + m = MVSD_BASE_DIV_MAX; ++ if(ios->clock==50000000 ) //by steven ++ m=1; + mvsd_write(MVSD_CLK_DIV, m); + host->clock = ios->clock; + host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); +-- +2.37.0 + diff --git a/libre/linux-libre-zen/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/libre/linux-libre-zen/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch new file mode 100644 index 0000000..b487155 --- /dev/null +++ b/libre/linux-libre-zen/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -0,0 +1,95 @@ +From 824cc151d839ce92269200119f9148013755adb8 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Tue, 18 Feb 2014 01:43:50 -0300 +Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter + +--- + drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + +diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c +index bfb58c91db04..29b7c4cb90f1 100644 +--- a/drivers/net/usb/smsc95xx.c ++++ b/drivers/net/usb/smsc95xx.c +@@ -54,6 +54,7 @@ + #define SUSPEND_SUSPEND3 (0x08) + #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ + SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) ++#define MAC_ADDR_LEN (6) + + #define SMSC95XX_NR_IRQS (1) /* raise to 12 for GPIOs */ + #define PHY_HWIRQ (SMSC95XX_NR_IRQS - 1) +@@ -78,6 +79,10 @@ static bool turbo_mode = true; + module_param(turbo_mode, bool, 0644); + MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); + ++static char *macaddr = ":"; ++module_param(macaddr, charp, 0); ++MODULE_PARM_DESC(macaddr, "MAC address"); ++ + static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index, + u32 *data) + { +@@ -761,8 +766,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) + return phy_mii_ioctl(netdev->phydev, rq, cmd); + } + ++/* Check the macaddr module parameter for a MAC address */ ++static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac) ++{ ++ int i, j, got_num, num; ++ u8 mtbl[MAC_ADDR_LEN]; ++ ++ if (macaddr[0] == ':') ++ return 0; ++ ++ i = 0; ++ j = 0; ++ num = 0; ++ got_num = 0; ++ while (j < MAC_ADDR_LEN) { ++ if (macaddr[i] && macaddr[i] != ':') { ++ got_num++; ++ if ('0' <= macaddr[i] && macaddr[i] <= '9') ++ num = num * 16 + macaddr[i] - '0'; ++ else if ('A' <= macaddr[i] && macaddr[i] <= 'F') ++ num = num * 16 + 10 + macaddr[i] - 'A'; ++ else if ('a' <= macaddr[i] && macaddr[i] <= 'f') ++ num = num * 16 + 10 + macaddr[i] - 'a'; ++ else ++ break; ++ i++; ++ } else if (got_num == 2) { ++ mtbl[j++] = (u8) num; ++ num = 0; ++ got_num = 0; ++ i++; ++ } else { ++ break; ++ } ++ } ++ ++ if (j == MAC_ADDR_LEN) { ++ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: " ++ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2], ++ mtbl[3], mtbl[4], mtbl[5]); ++ for (i = 0; i < MAC_ADDR_LEN; i++) ++ dev_mac[i] = mtbl[i]; ++ return 1; ++ } else { ++ return 0; ++ } ++} ++ + static void smsc95xx_init_mac_address(struct usbnet *dev) + { ++ /* Check module parameters */ ++ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr)) ++ return; ++ + u8 addr[ETH_ALEN]; + + /* maybe the boot loader passed the MAC address in devicetree */ +-- +2.37.0 + diff --git a/libre/linux-libre-zen/PKGBUILD b/libre/linux-libre-zen/PKGBUILD new file mode 100644 index 0000000..86d957d --- /dev/null +++ b/libre/linux-libre-zen/PKGBUILD @@ -0,0 +1,373 @@ +# Maintainer: David P. +# Contributor: André Silva +# Contributor: Márcio Silva +# Contributor: Nicolás Reynolds +# Contributor: Sorin-Mihai Vârgolici +# Contributor: Michał Masłowski +# Contributor: Luke R. + +# Based on linux-zen package + +_replacesarchkernel=() +_replacesoldkernels=(linux-libre-pck) +_replacesoldmodules=() + +pkgbase=linux-libre-zen +pkgver=6.6.8.zen1 +pkgrel=1 +pkgdesc='Linux-libre' +url='https://linux-libre.fsfla.org/' +arch=(i686 x86_64 armv7h) +license=(GPL2) +makedepends=( + bc + cpio + gettext + libelf + pahole + perl + python + tar + xz + + # htmldocs + graphviz + imagemagick + python-sphinx + texlive-latexextra +) +options=('!strip') +_srcname=linux-6.6 +_srctag=v${pkgver%.*}-${pkgver##*.} +source=( + "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} + "https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.*}-gnu/patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu.xz"{,.sign} + "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig} + "https://github.com/zen-kernel/zen-kernel/releases/download/$_srctag/linux-$_srctag.patch.zst"{,.sig} + config.i686 config.x86_64 config.armv7h # the main kernel config files + linux-armv7h.preset # armv7h preset file for mkinitcpio ramdisk + + # maintain the TTY over USB disconnects + # http://www.coreboot.org/EHCI_Gadget_Debug + 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch + # fix Atmel maXTouch touchscreen support + # https://labs.parabola.nu/issues/877 + # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html + 0002-fix-Atmel-maXTouch-touchscreen-support.patch +) +source_i686=( + # avoid using zstd compression in ultra mode (exhausts virtual memory) + no-ultra-zstd.patch +) +source_armv7h=( + # Arch Linux ARM patches + 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch + 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch + 0003-fix-mvsdio-eMMC-timing.patch + 0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch + #0005-set-default-cubietruck-led-triggers.patch + #0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch + #0007-USB-Armory-MkII-support.patch +) +validpgpkeys=( + 474402C8C582DAFBE389C427BCB7CF877E7D47A7 # Alexandre Oliva + 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 # David P. + A2FF3A36AAA56654109064AB19802F8B0D70FC30 # Jan Alexander Steffens (heftig) +) +sha256sums=('d71785bdb694fefaa4f183e5dd2ffc453c179db6f9427cc37e1ed046f0073ccf' + 'SKIP' + '4193aba41ae2eed56059b7fe917fa0b933573578b7a71f4e0fdb7a4487075170' + 'SKIP' + 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' + 'SKIP' + '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' + 'SKIP' + '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' + 'SKIP' + '754939cecb0938e147c7973ebce505b6aacd3e21572345f9aced312177df3ebf' + 'SKIP' + '63a18d5ca9202e2aecbd5fe6fbe09e9f3c17f490f10992272e583d4aaf348261' + 'daac5c2cc80ff908d01dae730907a8be4cb9a271b677c0626faaa1fb3a322df3' + '5d2601056dcde3544204ef4cbf396362fe604f542ed31cb3831a00e28c4040f6' + 'ca1708abbd2f8960c278722dc81a7c635973d92872386ad9e2fff10b86836e98' + '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' + '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25') +sha256sums_i686=('d32270be5fd9c3e3ba50f3aef33f6cfcb85be0c8216f03b777287cc621fdff28') +sha256sums_armv7h=('ef4661a32234fe12bda28e698400c78c11491387df83ee554c53afb4dba244da' + 'd3a4b7c7a3d3b4d69369b85630eef33b21cfbcffc23adbdc3cfa837610912287' + '2bce52fa4ae4d34ca171d3aa100302a920c231275fc3ba9141af8b2f68cf67d1' + '12d5706b00d2939b92130a4dc41d060f5e1fea75424b902ebceca72e427dc3b9') +b2sums=('e3e753fed07258f34e2e44e1acd4be0c22a3c58a3ae4856b518a4f99358f5bf6e8f38e41f422d9a434b33b0d7ee972e93ac7d37c9734949d6db263afe4c4f47c' + 'SKIP' + '53cb120b0bc8bce90e19fce0a69d05ab3f69d07ce75976d2106e0edaf5699fb71f777b1913c1fc36075d9dc46d3f4bfa1f9e4f2e7901bae869c28d3642a0a93e' + 'SKIP' + '73fee2ae5cb1ffd3e6584e56da86a8b1ff6c713aae54d77c0dab113890fc673dc5f300eb9ed93fb367b045ece8fa80304ff277fe61665eccf7b7ce24f0c045eb' + 'SKIP' + 'd02a1153a4285b32c774dca4560fe37907ccf30b8e487a681b717ed95ae9bed5988875c0a118938e5885ae9d2857e53a6f216b732b6fa3368e3c5fe08c86382c' + 'SKIP' + '580911af9431c066bbc072fd22d5e2ef65f12d8358cec5ff5a4f1b7deebb86cef6b5c1ad631f42350af72c51d44d2093c71f761234fb224a8b9dbb3b64b8201d' + 'SKIP' + 'b43bea249615fd8ebce9303fa9c889d4e4fd3310b0949c66aaa4ba026bd4b3bed871ef452536aaf891e33a5cf0b427d96da04146e8aa8e2e61f36afc203efcab' + 'SKIP' + '0842075aaddbd7e13878ab99f2136497a38efa2ca34a7aa8332c8dbe40220435b46a9c0294d87e2904c8d947d5bc803fe569ff9ca717f885857ec7ac5925bc68' + '6f5db13379546514d21091d24845c421bab9c1721a4b102ab970976e508f2505e5555d57ca85fc4f0da026d5200398e9a39e542bc718c9935aea86751b38296f' + '0455c8bd5b4db664bec18ffa3e6c11b616d4920e10a14dbbae120516a4c0204d7fb411fb5af8ece5054d37901ffdc3df41d781ecb7259693f0d61cbacafca012' + 'af69176b1117b94e56b043e97b0bd5873a2974a6a2fd52b102d0ffdca440ff68cfb241d6c4d4ef453cc8c220c236b739bad232e53fd500ce7672fa6e5ba87383' + 'c2214154c36900e311531bfe68184f31639f5c50fed23bc3803a7f18439b7ff258552a39f02fed0ea92f10744e17a6c55cef0ef1a98187f978fe480fb3dddc14' + '0c7ceba7cd90087db3296610a07886f337910bad265a32c052d3a703e6eb8e53f355ab9948d72d366408d968d8ee7435084dd89bef5ed0b69355fd884c2cd468') +b2sums_i686=('165ab9dd8cedeaae5327accc1581c19cf0be55f923b03feb889cad3351b74c7c4cd3d3c206938e5152bfe1d947513dea8f630f8f5544099ec13d16d254725c40') +b2sums_armv7h=('73ecc5862c6b4aef7b163c1992004273fbf791b82c75a8602e3def311f682f2b866124c0bfde90d03c7c76bb8b5853bdb9daad6ee2ab0908f4145cda476b8286' + '15f7b70b5d153e9336006aba873a78f94d91b8df5e1939041f12e678bb9cfbdda2e362001068a07c044ce606cf0d4d2e625002df9c569c914f7ac248d4d3e8ad' + '6219cec826bc543000ab87cf35dcc713f0635519cf79e75888b213a5e2d1f728e59e70df7fd842dda6e40494bf9cafa9f87368cb75b338c5a157a0adcf583512' + '66d6cff292962c4c8bbea62b2240c4c53c0c514f9e99864be9244cb846c505e1bedd800ca1347b80883543035d20573b06796e5bacbace6e829880695ffca781') + +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${pkgbase#linux-libre}}") + +case "$CARCH" in + i686|x86_64) KARCH=x86;; + armv7h) KARCH=arm;; +esac + +export KBUILD_BUILD_HOST=parabola +export KBUILD_BUILD_USER=$pkgbase +export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" + +prepare() { + cd $_srcname + + if [ "${_srcname##*-}" != "${pkgver%.*}" ]; then + echo "Applying upstream patch..." + patch -Np1 < "../patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu" + fi + + echo "Adding freedo as boot logo..." + install -m644 -t drivers/video/logo \ + ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm} + + echo "Setting version..." + echo "-$pkgrel" > localversion.10-pkgrel + echo "${pkgbase#linux-libre}" > localversion.20-pkgname + + sed -e "/^[-+]EXTRAVERSION =/s/= */= -gnu/" \ + -i "../linux-$_srctag.patch" + + local source=("${source[@]}") + case "$CARCH" in + "armv7h") + source+=("${source_armv7h[@]}") ;; + "i686") + source+=("${source_i686[@]}") ;; + esac + + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + src="${src%.zst}" + [[ $src = *.patch ]] || continue + echo "Applying patch $src..." + patch -Np1 < "../$src" + done + + echo "Setting config..." + cp ../config.$CARCH .config + make olddefconfig + diff -u ../config.$CARCH .config || : + + make -s kernelrelease > version + echo "Prepared $pkgbase version $( $@ + + quiet_cmd_zstd22 = ZSTD22 $@ +- cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -22 --ultra > $@ ++ cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -19 > $@ + + quiet_cmd_zstd22_with_size = ZSTD22 $@ +- cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@ ++ cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@ + + # ASM offsets From b1e45cf75d7cf878607ead25d209844b19d54e20 Mon Sep 17 00:00:00 2001 From: David P Date: Jan 03 2024 00:41:28 +0000 Subject: [PATCH 19/73] remove linux-libre-pck Signed-off-by: David P. --- diff --git a/libre/linux-libre-pck/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/libre/linux-libre-pck/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch deleted file mode 100644 index a6967e0..0000000 --- a/libre/linux-libre-pck/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cf30569da906ee631341244693ab1affde38809d Mon Sep 17 00:00:00 2001 -From: Willy Tarreau -Date: Sun, 2 Dec 2012 19:59:28 +0100 -Subject: [PATCH 1/7] ARM: atags: add support for Marvell's u-boot - -Marvell uses a specific atag in its u-boot which includes among other -information the MAC addresses for up to 4 network interfaces. - -Signed-off-by: Willy Tarreau ---- - arch/arm/include/uapi/asm/setup.h | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h -index 25ceda63b284..83578c54975b 100644 ---- a/arch/arm/include/uapi/asm/setup.h -+++ b/arch/arm/include/uapi/asm/setup.h -@@ -144,6 +144,18 @@ struct tag_memclk { - __u32 fmemclk; - }; - -+/* Marvell uboot parameters */ -+#define ATAG_MV_UBOOT 0x41000403 -+struct tag_mv_uboot { -+ __u32 uboot_version; -+ __u32 tclk; -+ __u32 sysclk; -+ __u32 isUsbHost; -+ __u8 macAddr[4][6]; -+ __u16 mtu[4]; -+ __u32 nand_ecc; -+}; -+ - struct tag { - struct tag_header hdr; - union { -@@ -166,6 +178,11 @@ struct tag { - * DC21285 specific - */ - struct tag_memclk memclk; -+ -+ /* -+ * Marvell specific -+ */ -+ struct tag_mv_uboot mv_uboot; - } u; - }; - --- -2.35.1 - diff --git a/libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch deleted file mode 100644 index e9de435..0000000 --- a/libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 716120e8010a7f400c6bed7384000e95e1465c94 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= -Date: Mon, 26 Aug 2013 19:19:44 +0300 -Subject: [PATCH 1/2] usb serial gadget: no TTY hangup on USB disconnect [WIP] -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We may want to maintain the TTY over USB disconnects. - -This is useful when we have a terminal console to a host which -power-cycles or for other reasons resets the USB host controller. - -Signed-off-by: Kyösti Mälkki ---- - drivers/usb/gadget/function/u_serial.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c -index b369292..d156a28 100644 ---- a/drivers/usb/gadget/function/u_serial.c -+++ b/drivers/usb/gadget/function/u_serial.c -@@ -1258,8 +1258,13 @@ void gserial_disconnect(struct gserial *gser) - gser->ioport = NULL; - if (port->port.count > 0 || port->openclose) { - wake_up_interruptible(&port->drain_wait); -+#if 0 - if (port->port.tty) - tty_hangup(port->port.tty); -+#else -+ if (port->port.tty) -+ stop_tty(port->port.tty); -+#endif - } - spin_unlock_irqrestore(&port->port_lock, flags); - --- -1.8.1.1 - diff --git a/libre/linux-libre-pck/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/libre/linux-libre-pck/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch deleted file mode 100644 index c822087..0000000 --- a/libre/linux-libre-pck/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9f2269dc32ec1f583bba94432ca17dcef3778677 Mon Sep 17 00:00:00 2001 -From: Willy Tarreau -Date: Sun, 2 Dec 2012 19:56:58 +0100 -Subject: [PATCH 2/7] ARM: atags/fdt: retrieve MAC addresses from Marvell boot - loader - -The atags are parsed and if a Marvell atag is found, up to 4 MAC -addresses are extracted there and assigned to node aliases eth0..3 -with the name "mac-address". - -This was tested on my Mirabox and the two NICs had their correct -address set. - -Signed-off-by: Willy Tarreau ---- - arch/arm/boot/compressed/atags_to_fdt.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c -index 1feb6b0f7a1f..5e5cb3094b6a 100644 ---- a/arch/arm/boot/compressed/atags_to_fdt.c -+++ b/arch/arm/boot/compressed/atags_to_fdt.c -@@ -205,6 +205,12 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) - hex_str(serno, atag->u.serialnr.high); - hex_str(serno+8, atag->u.serialnr.low); - setprop_string(fdt, "/", "serial-number", serno); -+ } else if (atag->hdr.tag == ATAG_MV_UBOOT) { -+ /* This ATAG provides up to 4 MAC addresses */ -+ setprop(fdt, "eth0", "mac-address", atag->u.mv_uboot.macAddr[0], 6); -+ setprop(fdt, "eth1", "mac-address", atag->u.mv_uboot.macAddr[1], 6); -+ setprop(fdt, "eth2", "mac-address", atag->u.mv_uboot.macAddr[2], 6); -+ setprop(fdt, "eth3", "mac-address", atag->u.mv_uboot.macAddr[3], 6); - } - } - --- -2.35.1 - diff --git a/libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch b/libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch deleted file mode 100644 index 5ad26fc..0000000 --- a/libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001 -From: André Silva -Date: Tue, 22 Mar 2016 17:58:59 -0300 -Subject: [PATCH 2/2] fix Atmel maXTouch touchscreen support - -The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu, -but not with the current longterm and mainline kernels in -Parabola. - -Now it needs to load nonfree firmware in mxt_initialize(), -which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the -atmel_mxt_ts driver fails to work. - -This driver works if changing reject_firmware_nowait to -request_firmware_nowait in atmel_mxt_ts.c. This line is -requesting the file named MXT_CFG_NAME, and it's a config file, -not the firmware blob. - -Signed-off-by: André Silva -Signed-off-by: mytbk ---- - drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c -index 726a83e..d818834 100644 ---- a/drivers/input/touchscreen/atmel_mxt_ts.c -+++ b/drivers/input/touchscreen/atmel_mxt_ts.c -@@ -1989,7 +1989,7 @@ static int mxt_initialize(struct mxt_data *data) - if (error) - goto err_free_object_table; - -- error = reject_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, -+ error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, - &client->dev, GFP_KERNEL, data, - mxt_config_cb); - if (error) { diff --git a/libre/linux-libre-pck/0003-fix-mvsdio-eMMC-timing.patch b/libre/linux-libre-pck/0003-fix-mvsdio-eMMC-timing.patch deleted file mode 100644 index a494c2d..0000000 --- a/libre/linux-libre-pck/0003-fix-mvsdio-eMMC-timing.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e8da1680d0273aaca806c23a10b4f3467a6b4f96 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Fri, 5 Sep 2014 15:43:56 -0600 -Subject: [PATCH 3/7] fix mvsdio eMMC timing - -These changes from Globalscale change the MMC timing to allow the eMMC versions -of the Mirabox and SMILE Plug to work. - -Signed-off-by: Kevin Mihelich ---- - drivers/mmc/host/mvsdio.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c -index 629efbe639c4..c507c064736c 100644 ---- a/drivers/mmc/host/mvsdio.c -+++ b/drivers/mmc/host/mvsdio.c -@@ -90,7 +90,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data) - tmout_index = fls(tmout - 1) - 12; - if (tmout_index < 0) - tmout_index = 0; -- if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX) -+// if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX) //by steven, try to setup the timeout to maximum value - tmout_index = MVSD_HOST_CTRL_TMOUT_MAX; - - dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n", -@@ -613,6 +613,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) - u32 m = DIV_ROUND_UP(host->base_clock, ios->clock) - 1; - if (m > MVSD_BASE_DIV_MAX) - m = MVSD_BASE_DIV_MAX; -+ if(ios->clock==50000000 ) //by steven -+ m=1; - mvsd_write(MVSD_CLK_DIV, m); - host->clock = ios->clock; - host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); --- -2.35.1 - diff --git a/libre/linux-libre-pck/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/libre/linux-libre-pck/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch deleted file mode 100644 index fd99811..0000000 --- a/libre/linux-libre-pck/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ /dev/null @@ -1,95 +0,0 @@ -From f0eaedee0904275b2ed55b383dba794d53fac17d Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter - ---- - drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ - 1 file changed, 56 insertions(+) - -diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index bc1e3dd67c04..51ae8e6fec4e 100644 ---- a/drivers/net/usb/smsc95xx.c -+++ b/drivers/net/usb/smsc95xx.c -@@ -50,6 +50,7 @@ - #define SUSPEND_SUSPEND3 (0x08) - #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ - SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) -+#define MAC_ADDR_LEN (6) - - struct smsc95xx_priv { - u32 mac_cr; -@@ -67,6 +68,10 @@ static bool turbo_mode = true; - module_param(turbo_mode, bool, 0644); - MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); - -+static char *macaddr = ":"; -+module_param(macaddr, charp, 0); -+MODULE_PARM_DESC(macaddr, "MAC address"); -+ - static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, - u32 *data, int in_pm) - { -@@ -753,8 +758,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) - return phy_mii_ioctl(netdev->phydev, rq, cmd); - } - -+/* Check the macaddr module parameter for a MAC address */ -+static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac) -+{ -+ int i, j, got_num, num; -+ u8 mtbl[MAC_ADDR_LEN]; -+ -+ if (macaddr[0] == ':') -+ return 0; -+ -+ i = 0; -+ j = 0; -+ num = 0; -+ got_num = 0; -+ while (j < MAC_ADDR_LEN) { -+ if (macaddr[i] && macaddr[i] != ':') { -+ got_num++; -+ if ('0' <= macaddr[i] && macaddr[i] <= '9') -+ num = num * 16 + macaddr[i] - '0'; -+ else if ('A' <= macaddr[i] && macaddr[i] <= 'F') -+ num = num * 16 + 10 + macaddr[i] - 'A'; -+ else if ('a' <= macaddr[i] && macaddr[i] <= 'f') -+ num = num * 16 + 10 + macaddr[i] - 'a'; -+ else -+ break; -+ i++; -+ } else if (got_num == 2) { -+ mtbl[j++] = (u8) num; -+ num = 0; -+ got_num = 0; -+ i++; -+ } else { -+ break; -+ } -+ } -+ -+ if (j == MAC_ADDR_LEN) { -+ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: " -+ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2], -+ mtbl[3], mtbl[4], mtbl[5]); -+ for (i = 0; i < MAC_ADDR_LEN; i++) -+ dev_mac[i] = mtbl[i]; -+ return 1; -+ } else { -+ return 0; -+ } -+} -+ - static void smsc95xx_init_mac_address(struct usbnet *dev) - { -+ /* Check module parameters */ -+ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr)) -+ return; -+ - u8 addr[ETH_ALEN]; - - /* maybe the boot loader passed the MAC address in devicetree */ --- -2.35.1 - diff --git a/libre/linux-libre-pck/0005-set-default-cubietruck-led-triggers.patch b/libre/linux-libre-pck/0005-set-default-cubietruck-led-triggers.patch deleted file mode 100644 index f090515..0000000 --- a/libre/linux-libre-pck/0005-set-default-cubietruck-led-triggers.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 363e156344b831978306bf95dac7859dafe61d14 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sat, 14 Feb 2015 12:32:27 +0100 -Subject: [PATCH 5/7] set default cubietruck led triggers - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index 52160e368304..21c8ef94c756 100644 ---- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -@@ -78,6 +78,7 @@ leds { - led-0 { - label = "cubietruck:blue:usr"; - gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; - }; - - led-1 { -@@ -93,6 +94,7 @@ led-2 { - led-3 { - label = "cubietruck:green:usr"; - gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "mmc0"; - }; - }; - --- -2.35.1 - diff --git a/libre/linux-libre-pck/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/libre/linux-libre-pck/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch deleted file mode 100644 index 3190152..0000000 --- a/libre/linux-libre-pck/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b4dcf8b9c59c451b667f7cc3f20e7fe837951517 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Thu, 11 Aug 2016 00:42:37 -0600 -Subject: [PATCH 6/7] exynos4412-odroid: set higher minimum buck2 regulator - voltage - -Set a higher minimum voltage to help reboot issue. -http://www.spinics.net/lists/linux-samsung-soc/msg54434.html - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -index 5b1d4591b35c..8a8d2c6add10 100644 ---- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -@@ -436,7 +436,7 @@ buck1_reg: BUCK1 { - - buck2_reg: BUCK2 { - regulator-name = "VDD_ARM"; -- regulator-min-microvolt = <900000>; -+ regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-boot-on; --- -2.35.1 - diff --git a/libre/linux-libre-pck/0007-USB-Armory-MkII-support.patch b/libre/linux-libre-pck/0007-USB-Armory-MkII-support.patch deleted file mode 100644 index 711d50d..0000000 --- a/libre/linux-libre-pck/0007-USB-Armory-MkII-support.patch +++ /dev/null @@ -1,561 +0,0 @@ -From 915405b2da517ee56a07e57230273ab2ff4e522d Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sun, 11 Aug 2019 12:34:17 -0600 -Subject: [PATCH 7/7] USB Armory MkII support - ---- - arch/arm/boot/dts/Makefile | 2 + - arch/arm/boot/dts/imx6ul-usbarmory.dts | 256 +++++++++++++++++++++++ - arch/arm/boot/dts/imx6ull-usbarmory.dts | 257 ++++++++++++++++++++++++ - 3 files changed, 515 insertions(+) - create mode 100644 arch/arm/boot/dts/imx6ul-usbarmory.dts - create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 235ad559acb2..ca79830160bd 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -694,6 +694,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ - imx6ul-tx6ul-0010.dtb \ - imx6ul-tx6ul-0011.dtb \ - imx6ul-tx6ul-mainboard.dtb \ -+ imx6ul-usbarmory.dtb \ - imx6ull-14x14-evk.dtb \ - imx6ull-colibri-emmc-eval-v3.dtb \ - imx6ull-colibri-eval-v3.dtb \ -@@ -704,6 +705,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ - imx6ull-phytec-segin-ff-rdk-nand.dtb \ - imx6ull-phytec-segin-ff-rdk-emmc.dtb \ - imx6ull-phytec-segin-lc-rdk-nand.dtb \ -+ imx6ull-usbarmory.dtb \ - imx6ulz-14x14-evk.dtb \ - imx6ulz-bsh-smm-m2.dtb - dtb-$(CONFIG_SOC_IMX7D) += \ -diff --git a/arch/arm/boot/dts/imx6ul-usbarmory.dts b/arch/arm/boot/dts/imx6ul-usbarmory.dts -new file mode 100644 -index 000000000000..1fdcd6f611d5 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6ul-usbarmory.dts -@@ -0,0 +1,256 @@ -+/* -+ * USB armory Mk II device tree file -+ * https://github.com/inversepath/usbarmory -+ * -+ * Copyright (C) 2019, F-Secure Corporation -+ * Andrej Rosano -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "imx6ul.dtsi" -+ -+/ { -+ model = "F-Secure USB armory Mk II"; -+ compatible = "inversepath,imx6ul-usbarmory-mkII", "fsl,imx6ul"; -+ -+ chosen { -+ stdout-path = &uart2; -+ }; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x80000000 0x20000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_led>; -+ -+ led-white { -+ label = "LED_WHITE"; -+ gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ -+ led-blue { -+ label = "LED_BLUE"; -+ gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ regulators { -+ compatible = "simple-bus"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ reg_sd1_vmmc: sd1_regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "VSD_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ }; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_bluetooth>; -+ uart-has-rtscts; -+ status = "okay"; -+}; -+ -+&uart2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart2>; -+ status = "okay"; -+}; -+ -+&usdhc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc1>; -+ no-1-8-v; -+ keep-power-in-suspend; -+ wakeup-source; -+ status = "okay"; -+}; -+ -+&usdhc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc2>; -+ non-removable; -+ status = "okay"; -+}; -+ -+&i2c1 { -+ pinctrl-0 = <&pinctrl_i2c1>; -+ status = "okay"; -+}; -+ -+&iomuxc { -+ pinctrl_uart2: uart2grp { -+ fsl,pins = < -+ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1 -+ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1 -+ >; -+ }; -+ -+ pinctrl_bluetooth: uart1grp { -+ fsl,pins = < -+ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b0 /* BT_UART_TX */ -+ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b0 /* BT_UART_RX */ -+ MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS 0x1b0b0 /* BT_UART_CTS */ -+ MX6UL_PAD_GPIO1_IO07__UART1_DCE_RTS 0x130b0 /* BT_UART_RTS */ -+ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x1f020 /* BT_UART_DSR */ -+ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10020 /* BT_UART_DTR */ -+ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x1f020 /* BT_SWDCLK */ -+ MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1f020 /* BT_SWDIO */ -+ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1f020 /* BT_RESET */ -+ MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x1f020 /* BT_SWITCH_1 */ -+ MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x1f020 /* BT_SWITCH_2 */ -+ >; -+ }; -+ -+ pinctrl_i2c1: i2c1grp { -+ fsl,pins = < -+ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0 -+ MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0 -+ >; -+ }; -+ -+ pinctrl_led: ledgrp { -+ fsl,pins = < -+ MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x1f020 -+ MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x1f020 -+ >; -+ }; -+ -+ pinctrl_usdhc1: usdhc1grp { -+ fsl,pins = < -+ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x1f019 -+ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x1f019 -+ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x1f019 -+ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x1f019 -+ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x1f019 -+ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x1f019 -+ >; -+ }; -+ -+ pinctrl_usdhc2: usdhc2grp { -+ fsl,pins = < -+ MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10071 -+ MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 -+ MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 -+ MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 -+ MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 -+ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 -+ MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 -+ MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 -+ MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 -+ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 -+ >; -+ }; -+}; -+ -+&aips2 { -+ crypto: crypto@2140000 { -+ compatible = "fsl,imx6ul-caam", "fsl,sec-v4.0"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ reg = <0x2140000 0x3c000>; -+ ranges = <0 0x2140000 0x3c000>; -+ interrupts = ; -+ clocks = <&clks IMX6UL_CLK_CAAM_IPG>, <&clks IMX6UL_CLK_CAAM_ACLK>, -+ <&clks IMX6UL_CLK_CAAM_MEM>; -+ clock-names = "ipg", "aclk", "mem"; -+ -+ sec_jr0: jr@1000 { -+ compatible = "fsl,sec-v4.0-job-ring"; -+ reg = <0x1000 0x1000>; -+ interrupts = ; -+ }; -+ -+ sec_jr1: jr@2000 { -+ compatible = "fsl,sec-v4.0-job-ring"; -+ reg = <0x2000 0x1000>; -+ interrupts = ; -+ }; -+ sec_jr2: jr@3000 { -+ compatible = "fsl,sec-v4.0-job-ring"; -+ reg = <0x3000 0x1000>; -+ interrupts = ; -+ }; -+ }; -+}; -+ -+/ { -+ soc { -+ caam_sm: caam-sm@00100000 { -+ compatible = "fsl,imx7d-caam-sm", "fsl,imx6q-caam-sm"; -+ reg = <0x00100000 0x3fff>; -+ }; -+ -+ irq_sec_vio: caam_secvio { -+ compatible = "fsl,imx7d-caam-secvio", "fsl,imx6q-caam-secvio"; -+ interrupts = ; -+ }; -+ }; -+ -+ caam_keyblob: caam-keyblob { -+ compatible = "fsl,sec-v4.0-keyblob"; -+ status = "okay"; -+ }; -+}; -+ -+&usbotg1 { -+ dr_mode = "peripheral"; -+ disable-over-current; -+ tpl-support; -+ status = "okay"; -+}; -+ -+&usbotg2 { -+ dr_mode = "host"; -+ disable-over-current; -+ tpl-support; -+ status = "okay"; -+}; -diff --git a/arch/arm/boot/dts/imx6ull-usbarmory.dts b/arch/arm/boot/dts/imx6ull-usbarmory.dts -new file mode 100644 -index 000000000000..f74d0296d5f6 ---- /dev/null -+++ b/arch/arm/boot/dts/imx6ull-usbarmory.dts -@@ -0,0 +1,257 @@ -+/* -+ * USB armory Mk II device tree file -+ * https://github.com/inversepath/usbarmory -+ * -+ * Copyright (C) 2019, F-Secure Corporation -+ * Andrej Rosano -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "imx6ul.dtsi" -+ -+/ { -+ model = "F-Secure USB armory Mk II"; -+ compatible = "inversepath,imx6ull-usbarmory-mkII", "fsl,imx6ull"; -+ -+ chosen { -+ stdout-path = &uart2; -+ }; -+ -+ memory { -+ device_type = "memory"; -+ reg = <0x80000000 0x20000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_led>; -+ -+ led-white { -+ label = "LED_WHITE"; -+ gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ -+ led-blue { -+ label = "LED_BLUE"; -+ gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ regulators { -+ compatible = "simple-bus"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ reg_sd1_vmmc: sd1_regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "VSD_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ }; -+}; -+ -+/* Delete CAAM node in AIPS-2 (i.MX6UL specific) */ -+/delete-node/ &crypto; -+ -+&cpu0 { -+ operating-points = < -+ /* kHz uV */ -+ 900000 1275000 -+ 792000 1225000 -+ 528000 1175000 -+ 396000 1025000 -+ 198000 950000 -+ >; -+ fsl,soc-operating-points = < -+ /* KHz uV */ -+ 900000 1250000 -+ 792000 1175000 -+ 528000 1175000 -+ 396000 1175000 -+ 198000 1175000 -+ >; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_bluetooth>; -+ uart-has-rtscts; -+ status = "okay"; -+}; -+ -+&uart2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart2>; -+ status = "okay"; -+}; -+ -+&usdhc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc1>; -+ no-1-8-v; -+ keep-power-in-suspend; -+ wakeup-source; -+ status = "okay"; -+}; -+ -+&usdhc2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usdhc2>; -+ non-removable; -+ status = "okay"; -+}; -+ -+&i2c1 { -+ pinctrl-0 = <&pinctrl_i2c1>; -+ status = "okay"; -+}; -+ -+&iomuxc { -+ pinctrl_uart2: uart2grp { -+ fsl,pins = < -+ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1 -+ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1 -+ >; -+ }; -+ -+ pinctrl_bluetooth: uart1grp { -+ fsl,pins = < -+ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b0 /* BT_UART_TX */ -+ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b0 /* BT_UART_RX */ -+ MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS 0x1b0b0 /* BT_UART_CTS */ -+ MX6UL_PAD_GPIO1_IO07__UART1_DCE_RTS 0x130b0 /* BT_UART_RTS */ -+ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x1f020 /* BT_UART_DSR */ -+ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10020 /* BT_UART_DTR */ -+ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x1f020 /* BT_SWDCLK */ -+ MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1f020 /* BT_SWDIO */ -+ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1f020 /* BT_RESET */ -+ MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x1f020 /* BT_SWITCH_1 */ -+ MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x1f020 /* BT_SWITCH_2 */ -+ >; -+ }; -+ -+ pinctrl_i2c1: i2c1grp { -+ fsl,pins = < -+ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0 -+ MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0 -+ >; -+ }; -+ -+ pinctrl_led: ledgrp { -+ fsl,pins = < -+ MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x1f020 -+ MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x1f020 -+ >; -+ }; -+ -+ pinctrl_usdhc1: usdhc1grp { -+ fsl,pins = < -+ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x1f019 -+ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x1f019 -+ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x1f019 -+ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x1f019 -+ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x1f019 -+ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x1f019 -+ >; -+ }; -+ -+ pinctrl_usdhc2: usdhc2grp { -+ fsl,pins = < -+ MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10071 -+ MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 -+ MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 -+ MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 -+ MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 -+ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 -+ MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 -+ MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 -+ MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 -+ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 -+ >; -+ }; -+}; -+ -+/ { -+ soc { -+ aips3: aips-bus@02200000 { -+ compatible = "fsl,aips-bus", "simple-bus"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ reg = <0x02200000 0x100000>; -+ ranges; -+ -+ dcp: dcp@02280000 { -+ compatible = "fsl,imx6ull-dcp", "fsl,imx6sl-dcp", "fsl,imx28-dcp"; -+ reg = <0x02280000 0x4000>; -+ interrupts = , -+ , -+ ; -+ clocks = <&clks IMX6ULL_CLK_DCP_CLK>; -+ clock-names = "dcp"; -+ }; -+ -+ rngb: rngb@02284000 { -+ compatible = "fsl,imx6sl-rng", "fsl,imx25-rngb", "fsl,imx-rng", "imx-rng"; -+ reg = <0x02284000 0x4000>; -+ interrupts = ; -+ clocks = <&clks IMX6UL_CLK_DUMMY>; -+ }; -+ }; -+ }; -+}; -+ -+&usbotg1 { -+ dr_mode = "peripheral"; -+ disable-over-current; -+ tpl-support; -+ status = "okay"; -+}; -+ -+&usbotg2 { -+ dr_mode = "host"; -+ disable-over-current; -+ tpl-support; -+ status = "okay"; -+}; --- -2.35.1 - diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD deleted file mode 100644 index 035825f..0000000 --- a/libre/linux-libre-pck/PKGBUILD +++ /dev/null @@ -1,354 +0,0 @@ -# Maintainer: David P. -# Contributor: André Silva -# Contributor: Márcio Silva -# Contributor: Nicolás Reynolds -# Contributor: Sorin-Mihai Vârgolici -# Contributor: Michał Masłowski -# Contributor: Luke R. - -# Based on linux-zen package - -_replacesarchkernel=('linux-zen') -_replacesoldkernels=() -_replacesoldmodules=() - -pkgbase=linux-libre-pck -pkgver=5.18.14.pck1 -pkgrel=1 -pkgdesc='Linux-libre PCK (Parabola community kernel)' -zenver="${pkgver//pck/zen}" -aufsver=20220620 -rcnver=5.18.12 -rcnrel=armv7-x8 -url='https://wiki.parabola.nu/PCK' -arch=(i686 x86_64 armv7h) -license=(GPL2) -makedepends=( - bc libelf pahole cpio perl tar xz - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra -) -options=('!strip') -_srcname=linux-5.18 -source=( - "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} - "https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.*}-gnu/patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu.xz"{,.sign} - "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig} - "https://framagit.org/Megver83/zen-patches/-/raw/main/patch-${zenver//.zen/-zen}.diff" - #"https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-${_srcname##*-}.patch" - "https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/${_srcname##*-}/aufs-patches/0001-aufs-${aufsver}.patch" - config.i686 config.x86_64 config.armv7h # the main kernel config files - linux-armv7h.preset # armv7h preset file for mkinitcpio ramdisk - - # maintain the TTY over USB disconnects - # http://www.coreboot.org/EHCI_Gadget_Debug - 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch - # fix Atmel maXTouch touchscreen support - # https://labs.parabola.nu/issues/877 - # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html - 0002-fix-Atmel-maXTouch-touchscreen-support.patch -) -source_i686=( - # avoid using zstd compression in ultra mode (exhausts virtual memory) - no-ultra-zstd.patch -) -source_armv7h=( - # RCN patch (CM3 firmware deblobbed and bloatware removed) - "https://repo.parabola.nu/other/rcn-libre/patches/$rcnver/rcn-libre-$rcnver-$rcnrel.patch"{,.sig} - # Arch Linux ARM patches - 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch - 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch - 0003-fix-mvsdio-eMMC-timing.patch - 0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch - 0005-set-default-cubietruck-led-triggers.patch - 0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch - 0007-USB-Armory-MkII-support.patch -) -validpgpkeys=( - '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva - '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P. -) -sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb' - 'SKIP' - '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34' - 'SKIP' - '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' - 'SKIP' - '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' - 'SKIP' - '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' - 'SKIP' - 'e86399efba97b385cb748e1f5e41dd777d9ce3c7a0affb33bfa6f3a3e7ca1c6d2b3a50b3341f1132cdd2be9590e817b82e73883698e50447e45ddc490c6b52a7' - 'f47bcdd8d32b0b2ff1c58d552e2fe83047b6aa183ba03670dfd4e0f1f27eec6808eab53904847b316d8e31c85b4d63a7f365c6a91008a6d6cbcf89639073a880' - '1f247490ca428c372194838919ba049e61f357249419998692c3a20cc6728d509b079f39f3edcc0f76342c437a350d28eefafe8aa743477cecbfff1bb43ea8bb' - '88369e64e767fe490c22a221a55a5aa51377995897b7462320d53d64c9e83cb57fba3ea8ec591f15263905f86dc9f23cca0492cbb6a562aeb1a0fab0f8e447cf' - '959f644c82015be6ddf0b84100b24d48a8208af7374d3ae748226e45ca592970354d20125df8cad2d71369c3d9d950f930776263dde8ce222d1afd571af331eb' - '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b' - '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' - 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168') -sha512sums_i686=('bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85') -sha512sums_armv7h=('94c6243d23bc995dec3edcb1dd5cc7d5e7d30fec70fc32b9be5f3e7d934da7035e9152fea3cce58a53b0f35f29060bdef2a3a2dac3c46f520adf1088897362f9' - 'SKIP' - '8da996a42249672893fa532ccbd096347580a0dc1698c45e9c865646e2765789553b1bb42793e721de30aea70340fdc116d2e4a50580fef999ca5fc627aaf4c3' - '0e6ddc24011d77a2e422b642c4507317fc2d26b20f5649818a2f11acac165ccab2cf2e64ab50d44ce7affcfe12c2ef5158790e499058831e7995400b2087df78' - '5d2f228151148358b07744a9c09cf6e2420c4284735d4ce7dc925a1deb3970298cc95dd766ee13e094e2853847b016c3ebc2d61bb423e370b4bc33938367ebda' - 'a206c3dc678839831d72eefee997cbe1bb877af7f6f90dfe5cab0bd7d9686a3b13a2aba74c8fbe5533872e12306ac9ea1b5eede18ef3cf10b8d01361afd67e9c' - 'a1072dd808c63592178cc01ea3c36de946f277fb451b13c34f51a5ac134cde4a8a4d57487132af1c6d7b5820842cdda9dc4edb3da85d33bd02bf87a032c3263a' - '85b2e16a930b8066990c42f973d386dc3c6d62fdf3d1289bbb51df3df296c26f30051162fba49a42d38f71f05de926aa8c065097f14bd8e9f8e28a52949ead00' - '2e99582d8b670b6c6b27add14b60e957cbcf9cd6aae40491bd9dea6ac455c0ade0bbee21e3bdfb5e06ce83ad27c5a788404b05bf7ac93831ca18d2e60a67017c') - -_replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") -_replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}") -_replacesoldmodules=("${_replacesoldmodules[@]/\%/${pkgbase#linux-libre}}") - -case "$CARCH" in - i686|x86_64) KARCH=x86;; - armv7h) KARCH=arm;; -esac - -export KBUILD_BUILD_HOST=parabola -export KBUILD_BUILD_USER=$pkgbase -export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" - -prepare() { - cd $_srcname - - if [ "${_srcname##*-}" != "${pkgver%.*}" ]; then - echo "Applying upstream patch..." - patch -Np1 < "../patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu" - fi - - echo "Adding freedo as boot logo..." - install -m644 -t drivers/video/logo \ - ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm} - - echo "Setting version..." - scripts/setlocalversion --save-scmversion - echo "-$pkgrel" > localversion.10-pkgrel - echo "${pkgbase#linux-libre}" > localversion.20-pkgname - - echo "Applying Zen Patch..." - sed -e "/^+EXTRAVERSION = -zen/s/zen/pck/" \ - -e "/^[-+]EXTRAVERSION =/s/= */= -gnu/" \ - "../patch-${zenver//.zen/-zen}.diff" | patch -Np1 -i - - - if [ "$CARCH" = "armv7h" ]; then - local src_armv7h - for src_armv7h in "${source_armv7h[@]}"; do - src_armv7h="${src_armv7h%%::*}" - src_armv7h="${src_armv7h##*/}" - [[ $src_armv7h = *.patch ]] || continue - echo "Applying patch $src_armv7h..." - patch -Np1 < "../$src_armv7h" - done - fi - - if [ "$CARCH" = "i686" ]; then - local src_i686 - for src_i686 in "${source_i686[@]}"; do - src_i686="${src_i686%%::*}" - src_i686="${src_i686##*/}" - [[ $src_i686 = *.patch ]] || continue - echo "Applying patch $src_i686..." - patch -Np1 < "../$src_i686" - done - fi - - local src - for src in "${source[@]}"; do - src="${src%%::*}" - src="${src##*/}" - [[ $src = *.patch ]] || continue - echo "Applying patch $src..." - patch -Np1 < "../$src" - done - - echo "Setting config..." - cp ../config.$CARCH .config - make olddefconfig - diff -u ../config.$CARCH .config || : - - make -s kernelrelease > version - echo "Prepared $pkgbase version $( $@ - - quiet_cmd_zstd22 = ZSTD22 $@ -- cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -22 --ultra > $@ -+ cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -19 > $@ - - quiet_cmd_zstd22_with_size = ZSTD22 $@ -- cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@ -+ cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@ - - # ASM offsets From c3513aa35b6040936476dc14b0591010a94ed1b0 Mon Sep 17 00:00:00 2001 From: David P Date: Jan 03 2024 02:31:01 +0000 Subject: [PATCH 20/73] remove uefi-shell --- diff --git a/libre/uefi-shell/PKGBUILD b/libre/uefi-shell/PKGBUILD deleted file mode 100644 index e77751e..0000000 --- a/libre/uefi-shell/PKGBUILD +++ /dev/null @@ -1,114 +0,0 @@ -# Maintainer (hyperbola): André Silva -# Maintainer: David P. - -# based in Hyperbola's edk2-uefi-shell, but without i686/IA32 -# support and with UEFI Shell v1 included - -pkgname=uefi-shell -pkgver=201811 -pkgrel=1 -_srcname=edk2-stable$pkgver -pkgdesc='Tianocore UEFI Shell v1 and v2' -url='https://github.com/tianocore/edk2' -arch=(x86_64) -license=(BSD) -makedepends=(python2 nasm gnu-efi-libs subversion) -options=(!strip !makeflags) -source=(https://github.com/tianocore/edk2/archive/$_srcname.tar.gz - svn+https://svn.code.sf.net/p/efi-shell/code/trunk/Shell) -sha512sums=('103cb503b73a57996b4ea7c941cb788ebf276e0f4b55480acf2080a632e956d27b0cf4b2a9cb41bac04e1c6aecf38d51c4b49432908e2fcbe6e10ced94d01573' - 'SKIP') - -prepare() { - cd $srcdir/edk2-$_srcname - - msg 'Cleanup UDK config files' - rm -rf Build - rm -rf Conf - mkdir -p Conf - mkdir -p Build - - msg 'Delete bogus dependency files' - find . -name '*.d' -delete - - msg 'Disable build ID generation' - sed -i 's|,--gc-sections|,--gc-sections,--build-id=none|g' BaseTools/Conf/tools_def.template - - msg 'Use python2 for UDK BaseTools' - sed -i 's|python |python2 |g' BaseTools/BinWrappers/PosixLike/* - sed -i 's|python |python2 |g' BaseTools/Tests/GNUmakefile - - msg 'Fix GCC Warning as error' - sed -i 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' BaseTools/Source/C/Makefiles/header.makefile - sed -i 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' BaseTools/Conf/tools_def.template - - msg 'Remove GCC -g debug option and add -O0 -mabi=ms -maccumulate-outgoing-args' - sed -i 's|DEFINE GCC_ALL_CC_FLAGS = -g |DEFINE GCC_ALL_CC_FLAGS = -O0 -mabi=ms -maccumulate-outgoing-args |g' BaseTools/Conf/tools_def.template - sed -i 's|DEFINE GCC44_ALL_CC_FLAGS = -g |DEFINE GCC44_ALL_CC_FLAGS = -O0 -mabi=ms -maccumulate-outgoing-args |g' BaseTools/Conf/tools_def.template - - msg 'Fix UDK Target Platform' - sed -i 's|ACTIVE_PLATFORM = Nt32Pkg/Nt32Pkg.dsc|ACTIVE_PLATFORM = EdkShellPkg/EdkShellPkg.dsc|g' BaseTools/Conf/target.template - sed -i 's|TARGET = DEBUG|TARGET = RELEASE|g' BaseTools/Conf/target.template - sed -i 's|TOOL_CHAIN_TAG = MYTOOLS|TOOL_CHAIN_TAG = GCC5|g' BaseTools/Conf/target.template - sed -i 's|IA32|X64|g' BaseTools/Conf/target.template - - chmod 0755 BaseTools/BuildEnv - - msg 'Move Shell directory to the main source' - mv ../Shell . - - msg 'Apply EDK Shell patch to support GCC' - cd Shell - patch -p1 -i ../EdkShellPkg/ShellR64.patch - - msg 'Fix efilibplat.h path' - sed -i 's|efilibplat.h|efi/x86_64/efilibplat.h|g' Library/EfiShellLib.h - sed -i 's|#define RFC_3066_ENTRY_SIZE 12|#define RFC_3066_ENTRY_SIZE 12\n\n#define MIN_ALIGNMENT_SIZE 8|' Library/EfiShellLib.h -} - -build() { - cd $srcdir/edk2-$_srcname - - msg 'Unset all compiler FLAGS' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - msg 'Setup UDK Environment' - source $srcdir/edk2-$_srcname/BaseTools/BuildEnv BaseTools - echo - - msg 'Compile UDK BaseTools' - make -C BaseTools - echo - - msg 'Unset all compiler FLAGS' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - msg 'Compile UEFI Shell v1 X64 binary' - BaseTools/BinWrappers/PosixLike/build -p EdkShellPkg/EdkShellPkg.dsc -a X64 -b RELEASE -t GCC5 -m Shell/Shell.inf - echo - - msg 'Compile UEFI Shell v2 X64 binary' - BaseTools/BinWrappers/PosixLike/build -p ShellPkg/ShellPkg.dsc -a X64 -b RELEASE -t GCC5 - echo -} - -package() { - msg 'Install the UEFI Shell v1 X64 binary' - install -d $pkgdir/usr/share/uefi-shell - install -D -m0644 $srcdir/edk2-$_srcname/Build/EdkShellPkg/RELEASE_GCC5/X64/Shell.efi $pkgdir/usr/share/uefi-shell/shellx64_v1.efi - - msg 'Install the UEFI Shell v2 X64 binary' - install -d $pkgdir/usr/share/uefi-shell - install -D -m0644 $srcdir/edk2-$_srcname/Build/Shell/RELEASE_GCC5/X64/Shell.efi $pkgdir/usr/share/uefi-shell/shellx64_v2.efi - - msg 'Install license' - install -Dm644 $srcdir/edk2-$_srcname/License.txt $pkgdir/usr/share/licenses/$pkgname/License.txt -} From 0f1133252b7ed9b62426fb247d82854bdcec84ef Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 06 2024 23:57:03 +0000 Subject: [PATCH 21/73] [your-freedom]: upgrade to v20240103 --- diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 12e33f1..0fff1a5 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -11,8 +11,8 @@ pkgname=your-freedom -pkgver=20230907 -_gitver=5accb7a0a8afd5498743f3eba66d535d4c84bb42 +pkgver=20240103 +_gitver=4a4e77e8b0157e1d993d331140caff5a5bed3bbb pkgrel=1 pkgdesc="This meta-package conflicts with every known non-free Arch package" arch=(any) @@ -24,7 +24,7 @@ makedepends=(librelib) install=${pkgname}.install source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) -sha256sums=('b22645d364cd57e7d49f028b1ce8ce47ca06ebf65b96d82d27603fbe8f941ba2') +sha256sums=('07c9400deef1d96cc6c470a8a88ccd0cde222d085cb7eb557b9b95a00e8d8073') package() From 61260dd92b3f6e05c1a3e949db89fcd9008ebe01 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 06 2024 23:57:31 +0000 Subject: [PATCH 22/73] [your-freedom][your-gaming-freedom][your-privacy][your-init-freedom]: normalize related recipes --- diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 0fff1a5..4002b04 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -6,23 +6,24 @@ # The package is normally built automatically by the auto-builder. # To generate a new package, simply push changes to blacklist.git. # If ${pkgname}-blacklist.txt is modified, the auto-builder will -# replace $pkgver, $_gitver, and the checksum (updpkgsums), +# replace $pkgver, $_srcver, and the checksum (updpkgsums), # build and publish the package, and commit the changes to abslibre. pkgname=your-freedom pkgver=20240103 -_gitver=4a4e77e8b0157e1d993d331140caff5a5bed3bbb +_srcver=4a4e77e8b0157e1d993d331140caff5a5bed3bbb pkgrel=1 pkgdesc="This meta-package conflicts with every known non-free Arch package" arch=(any) url=https://wiki.parabola.nu/Blacklist -license=(custom:CCPL:zero) # TODO: NYI -# license=('CCPL:zero') # TODO: NYI +license=(custom:CCPL:zero) +# license=('CCPL:zero') # TODO: NYI makedepends=(librelib) install=${pkgname}.install -source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) +_srcname=${pkgname}-blacklist-${_srcver}.txt +source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_srcver}) sha256sums=('07c9400deef1d96cc6c470a8a88ccd0cde222d085cb7eb557b9b95a00e8d8073') @@ -31,10 +32,8 @@ package() { # collect blacklisted package names as pacman conflicts, # also to be excluded by the repo importer, and rejected by libremakepkg - # TODO: rename blacklist.txt to your-freedom-blacklist.txt (without breaking tools) -# conflicts=( $( libreblacklist normalize < ${pkgname}-blacklist-${_gitver}.txt | \ - conflicts=( $( libreblacklist normalize < blacklist-${_gitver}.txt | \ - cut -d: -f1,2 | sed -n 's/:$//p' | sort -u ) ) + conflicts=( $( libreblacklist normalize < ${_srcname} | \ + cut -d: -f1,2 | sed -n 's/:$//p' | sort -u ) ) - install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt + install -Dm644 ${_srcname} "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt } diff --git a/libre/your-gaming-freedom/PKGBUILD b/libre/your-gaming-freedom/PKGBUILD index 073b60c..549c938 100644 --- a/libre/your-gaming-freedom/PKGBUILD +++ b/libre/your-gaming-freedom/PKGBUILD @@ -6,24 +6,25 @@ # The package is normally built automatically by the auto-builder. # To generate a new package, simply push changes to blacklist.git. # If ${pkgname}-blacklist.txt is modified, the auto-builder will -# replace $pkgver, $_gitver, and the checksum (updpkgsums), +# replace $pkgver, $_srcver, and the checksum (updpkgsums), # build and publish the package, and commit the changes to abslibre. pkgname=your-gaming-freedom # TODO: change any references on the wiki pkgver=20210421 pkgrel=1 -_gitver=110648841b57d023531ac19319f360a8bd727ec6 +_srcver=110648841b57d023531ac19319f360a8bd727ec6 pkgdesc="This meta-package conflicts with emulators for which no libre games, OS or applications exist (yet)" pkgdesc+=", and games with dubious free culture licensing" # TODO: why not right? - either this, or many games should be deleted arch=(any) url=https://wiki.parabola.nu/Blacklist -license=(custom:CCPL:zero) # TODO: NYI -# license=('CCPL:zero') # TODO: NYI +license=(custom:CCPL:zero) +# license=('CCPL:zero') # TODO: NYI makedepends=(librelib) install=${pkgname}.install -source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) +_srcname=${pkgname}-blacklist-${_srcver}.txt +source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_srcver}) sha256sums=('62def808e6f25d9e63cf0e13420e40631aee11cfd68391224b2658e29ad03970') @@ -31,8 +32,8 @@ sha256sums=('62def808e6f25d9e63cf0e13420e40631aee11cfd68391224b2658e29ad03970') package() { # collect blacklisted package names as pacman conflicts - conflicts=( $( libreblacklist normalize < ${pkgname}-blacklist-${_gitver}.txt | \ - cut -d: -f1,2 | sed -n 's/:$//p' | sort -u ) ) + conflicts=( $( libreblacklist normalize < ${_srcname} | \ + cut -d: -f1,2 | sed -n 's/:$//p' | sort -u ) ) - install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt + install -Dm644 ${_srcname} "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt } diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD index 42c51e3..d234981 100644 --- a/nonprism/your-privacy/PKGBUILD +++ b/nonprism/your-privacy/PKGBUILD @@ -6,25 +6,26 @@ # The package is normally built automatically by the auto-builder. # To generate a new package, simply push changes to blacklist.git. # If ${pkgname}-blacklist.txt is modified, the auto-builder will -# replace $pkgver, $_gitver, and the checksum (updpkgsums), +# replace $pkgver, $_srcver, and the checksum (updpkgsums), # build and publish the package, and commit the changes to abslibre. pkgname=your-privacy pkgver=20221006 pkgrel=2 -_gitver=ab32447a5a47a2a5ec5a3fa6043dc6b9024e3674 +_srcver=ab32447a5a47a2a5ec5a3fa6043dc6b9024e3674 pkgdesc="This package will remove support for protocols and services known to endanger privacy." arch=(any) url=https://wiki.parabola.nu/Blacklist -license=(GPL3) +license=(custom:CCPL:zero) +# license=('CCPL:zero') # TODO: NYI makedepends=(librelib) backup=(etc/NetworkManager/conf.d/20-connectivity.conf) install=${pkgname}.install - -source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver} - archlinux-keyring.hook) +_srcname=${pkgname}-blacklist-${_srcver}.txt +source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_srcver}) +source+=(archlinux-keyring.hook) sha512sums=('9ab837a9ca351bb844ecdfc147d69ec1f0d1971fbe12ceeed3b837fc59c54b10d2476901e60f677b0f53166a805b493b0a8bcd638e9e6638012dd454c7930cf8' '864b419e3aec86adc3ee2cc49ccba69e209f53cf174e889f25c21b0f0813760432e98e7eb024d30376163efec2a6e6d2693a871d895d7de5133bcd2f4df9626b') @@ -32,15 +33,11 @@ sha512sums=('9ab837a9ca351bb844ecdfc147d69ec1f0d1971fbe12ceeed3b837fc59c54b10d24 package() { - local blacklist_file=${pkgname}-blacklist-${_gitver}.txt - # collect blacklisted package names as pacman conflicts - conflicts=( $( libreblacklist normalize < ${blacklist_file} | \ - cut -d: -f1,2 | \ - sed -n 's/:$//p' | \ - sort -u ) ) + conflicts=( $( libreblacklist normalize < ${_srcname} | \ + cut -d: -f1,2 | sed -n 's/:$//p' | sort -u ) ) - install -Dm644 ${blacklist_file} "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt + install -Dm644 ${_srcname} "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt # disable automatic archlinux-keyring refresh install -Dm644 archlinux-keyring.hook "${pkgdir}"/usr/share/libalpm/hooks/archlinux-keyring.hook diff --git a/nonsystemd/your-init-freedom/PKGBUILD b/nonsystemd/your-init-freedom/PKGBUILD index 0aa4104..249e174 100644 --- a/nonsystemd/your-init-freedom/PKGBUILD +++ b/nonsystemd/your-init-freedom/PKGBUILD @@ -6,25 +6,26 @@ # The package is normally built automatically by the auto-builder. # To generate a new package, simply push changes to blacklist.git. # If ${pkgname}-blacklist.txt is modified, the auto-builder will -# replace $pkgver, $_gitver, and the checksum (updpkgsums), +# replace $pkgver, $_srcver, and the checksum (updpkgsums), # build and publish the package, and commit the changes to abslibre. pkgname=your-init-freedom pkgver=20221021 pkgrel=1 -_gitver=249a8e38967abf9243252f03a4b33100cd636dbb +_srcver=249a8e38967abf9243252f03a4b33100cd636dbb pkgdesc="This meta-package conflicts with every package which strictly requires systemd" arch=(any) url=https://wiki.parabola.nu/Blacklist -license=(custom:CCPL:zero) # TODO: NYI -# license=('CCPL:zero') # TODO: NYI +license=(custom:CCPL:zero) +# license=('CCPL:zero') # TODO: NYI replaces=(your-initfreedom) makedepends=(librelib) install=${pkgname}.install -source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) +_srcname=${pkgname}-blacklist-${_srcver}.txt +source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_srcver}) sha256sums=('6dbe07d8f0fe38d90a1b6811ecfd2543f4638a94a36954256d3b6d1432768891') @@ -32,8 +33,8 @@ sha256sums=('6dbe07d8f0fe38d90a1b6811ecfd2543f4638a94a36954256d3b6d1432768891') package() { # collect blacklisted package names as pacman conflicts - conflicts=( $( libreblacklist normalize < ${pkgname}-blacklist-${_gitver}.txt | \ - cut -d: -f1,2 | sed -n 's/:$//p' | sort -u ) ) + conflicts=( $( libreblacklist normalize < ${_srcname} | \ + cut -d: -f1,2 | sed -n 's/:$//p' | sort -u ) ) - install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt + install -Dm644 ${_srcname} "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt } From d6f5d7fa8b096137a301e4d852385020087001c4 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 06 2024 23:57:45 +0000 Subject: [PATCH 23/73] housekeeping --- diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD index e32db85..b742be2 100644 --- a/libre/uboot4extlinux-sunxi/PKGBUILD +++ b/libre/uboot4extlinux-sunxi/PKGBUILD @@ -9,9 +9,9 @@ # - The package name. Example: uboot4extlinux-a20-olinuxino_micro # - The u-boot configuration. Example: A20-OLinuXino_MICRO_defconfig # - The name of the board(s). Example: A20 OLinuXino Micro -# A single package / u-boot configuration sometimes support multiple -# boards and the configuration name doesn't always have the boards names -# in it. Example: uboot4extlinux-am335x_bone supports various BeagleBones, +# A single u-boot configuration/package sometimes supports multiple +# boards and the configuration name doesn't always denote all board names +# Example: uboot4extlinux-am335x_bone supports various BeagleBones, # the AM335x GP EVM and the EVM SK all in one u-boot binary and package. # - If relevant, the packages it replaces, if there are older u-boot packages # also supporting that board. Example:uboot-a20-olinuxino-micro @@ -26,11 +26,13 @@ # for example of the information mentioned above and add it in the PKGBUILD # for their boards. # -# After adding a new board in this PKGBUILD, to get the board officially -# supported by Parabola.you also need to create a page for it in the -# Parabola wiki for that board and update the ARM installation guide to -# point to it when relevant. Examples of that are available for other -# boards in the ARM installation guide. +# After adding a new board in this PKGBUILD, you should also create a +# 'Computers/' page on the Parabola wiki for that board, and update the relevant +# sections of the 'ARM Installation Guide' to refer to it for any board-specific +# details. The wiki has examples: +# * https://wiki.parabola.nu/ARM_Installation_Guide +# * https://wiki.parabola.nu/Computers. + _pkgbase=u-boot-libre pkgbase=uboot4extlinux-sunxi diff --git a/libre/uboot4extlinux-sunxi/install-uboot4extlinux.sh.in b/libre/uboot4extlinux-sunxi/install-uboot4extlinux.sh.in index 1c744f3..d3a40f0 100644 --- a/libre/uboot4extlinux-sunxi/install-uboot4extlinux.sh.in +++ b/libre/uboot4extlinux-sunxi/install-uboot4extlinux.sh.in @@ -2,13 +2,12 @@ # SPDX-License-Identifier: GPL-2.0+ # Copyright (C) 2020 Denis 'GNUtoo' Carikli -progname="install-uboot4extlinux.sh" u_boot_with_spl="@u_boot_with_spl@" u_boot_with_spl_offset=@u_boot_with_spl_offset@ usage() { - echo "Usage: ${progname} [INSTALL_DEVICE]" + echo "Usage: $0 [INSTALL_DEVICE]" } install_image() @@ -60,7 +59,7 @@ install_image() echo " offset: ${offset}" echo " size: ${image_size}" echo " By default, "\ - "partitioing tools makes the first partition start at 1MiB" + "partitioning tools makes the first partition start at 1MiB" echo " Instaling ${images} "\ "would overwrite that first partition (if it's present)." echo " Please contact the Parabola developers " \ @@ -82,7 +81,7 @@ install_image() } if [ $# -ne 1 ] ; then - usage + usage else - install_image "$1" "${u_boot_with_spl_offset}" "${u_boot_with_spl}" + install_image "$1" "${u_boot_with_spl_offset}" "${u_boot_with_spl}" fi From cb8f06da040a0f6731cbf4f414d3d2f1015ed56c Mon Sep 17 00:00:00 2001 From: SolveFinder Date: Jan 06 2024 23:58:02 +0000 Subject: [PATCH 24/73] updpkg: libre/ark 23.08.4-1.parabola1 --- diff --git a/libre/ark/PKGBUILD b/libre/ark/PKGBUILD index af276d0..e22153b 100644 --- a/libre/ark/PKGBUILD +++ b/libre/ark/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: jc_gargma pkgname=ark -pkgver=23.08.2 -pkgrel=2 +pkgver=23.08.4 +pkgrel=1 pkgrel+=.parabola1 pkgdesc='Archiving Tool' pkgdesc+=', with unarchiver support' @@ -20,20 +20,16 @@ makedepends=(extra-cmake-modules kdoctools5) optdepends=('p7zip: 7Z format support' 'unarchiver: RAR format support' 'lzop: LZO format support' 'lrzip: LRZ format support' 'arj: ARJ format support') groups=(kde-applications kde-utilities) -source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig} - https://invent.kde.org/utilities/ark/-/commit/9bcbcb05.patch) +source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}) source+=(libre.patch) -sha256sums=('3112e6be5eae476c851ece194b2b68888d29b167b7ec1b3a8754a8838ee72b6f' +sha256sums=('222426ca788b3ba286c619ee6f9228e5f256d5e013d45ea7ef5d322fdb9eaa9e' 'SKIP' - '3f05d8333fc79c089d3193c17ec5751f52ac73799c57594b86273c1e2633cd5f' '624bd7cd221db2a80b21cd5f71c447d86091e52276f2bdb609c8916755c7d602') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker prepare() { - patch -d $pkgname-$pkgver -p1 < 9bcbcb05.patch # Fix opening bzip2 files - # Remove unrar plugin patch -d $pkgname-$pkgver -p1 < libre.patch rm -rv $pkgname-$pkgver/plugins/clirarplugin From b0cc87d365c9912c16536a8c215b374ab26317a1 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 06 2024 23:58:47 +0000 Subject: [PATCH 25/73] [ark]: housekeeping - tweak for i686 --- diff --git a/libre/ark/PKGBUILD b/libre/ark/PKGBUILD index e22153b..303a8f9 100644 --- a/libre/ark/PKGBUILD +++ b/libre/ark/PKGBUILD @@ -1,36 +1,40 @@ -# Maintainer (Arch): Antonio Rojas -# Maintainer (Arch): Felix Yan -# Contributor (Arch): Andrea Scarpino +# Maintainer (arch): Antonio Rojas +# Maintainer (arch): Felix Yan +# Contributor: Andrea Scarpino # Maintainer: Andreas Grapentin # Contributor: André Silva # Contributor: jc_gargma + pkgname=ark pkgver=23.08.4 pkgrel=1 pkgrel+=.parabola1 pkgdesc='Archiving Tool' -pkgdesc+=', with unarchiver support' arch=(x86_64) -arch+=(i686 armv7h) +arch+=(armv7h i686) url='https://apps.kde.org/ark/' license=(GPL) depends=(kparts5 kpty5 libarchive libzip hicolor-icon-theme) makedepends=(extra-cmake-modules kdoctools5) +[[ "${CARCH}" == i686 ]] && depends=( ${depends[*]%5} ) # k*5 things n/a i686 +[[ "${CARCH}" == i686 ]] && makedepends=( ${makedepends[*]%5} ) # k*5 things n/a i686 optdepends=('p7zip: 7Z format support' 'unarchiver: RAR format support' 'lzop: LZO format support' 'lrzip: LRZ format support' 'arj: ARJ format support') groups=(kde-applications kde-utilities) source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}) source+=(libre.patch) sha256sums=('222426ca788b3ba286c619ee6f9228e5f256d5e013d45ea7ef5d322fdb9eaa9e' - 'SKIP' - '624bd7cd221db2a80b21cd5f71c447d86091e52276f2bdb609c8916755c7d602') + 'SKIP') +sha256sums+=('624bd7cd221db2a80b21cd5f71c447d86091e52276f2bdb609c8916755c7d602') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker + prepare() { # Remove unrar plugin + echo "applying libre.patch" patch -d $pkgname-$pkgver -p1 < libre.patch rm -rv $pkgname-$pkgver/plugins/clirarplugin } diff --git a/libre/ark/keys/pgp/CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7.asc b/libre/ark/keys/pgp/CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7.asc new file mode 100644 index 0000000..07050e6 --- /dev/null +++ b/libre/ark/keys/pgp/CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7.asc @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFfNZD4BEACo0YKCUEhTY7v8VZVw3csAtnsRSFQ18G8xfYIt7mJEBrtfiGG4 +g28EjNeWQfN8wGIaAeRGl5nb7s9RRpxXStUu719jGX1Z9Sr8p/JOmBS5kdfAtYId +9Cl3VsGRvf4Smg1ClrEv6tQ97j+d1FY8QfgW/GS46YBOEeOFVQRtfi7Yv9lZkiBF +rzP0Nr7JV9u1GkBsFgNkVuYs/3RDYULItBwGFerduOyQCOt819QvHHSZkXqJWwNR +OA6lc8gW36lKbDHoZ1jSkDnDV0bW0cX1/6WJSzWYdcPiceA1vj/VDg0Kr23SVQ1P +yPvBirT7ToirQm6KrIiKHWLSg156ht8/K2C1Dgypf+YMseMbHQxVLrI2p4zpmxu3 +B2SrSj3ImM5FO0XGd1gxn/qywNVJDQBfcYnndksD2i/9/Es8I/F6OymBZl4HWBvx +7ixm2JPXkmwVPEC/lJn3eCBb1fAaJSlroHtaAEteCWuE5/Mg/uYEh1UeAstP47N3 +P0B3l1E4Ccw1ne2/O1BdsnXeUaI3YVYz9aZkVlL7ywda3h/goRKxc1b18bmgu/Ed +QmcTEMj29B3szMpetWNt1ZbaMJzfDw+z+SiQ3toOTUiqMuWq+l+JK0dVUzOvpGhG +VHv5m9CtJFP671ivEc4it0hJRH5kdW9aNbeG0g9TxHQqQMJIpeLvRq5WKwARAQAB +tCFBbGJlcnQgQXN0YWxzIENpZCA8YWFjaWRAa2RlLm9yZz6JAlQEEwEIAD4CGwMF +CwkIBwIGFQgJCgsCBBYCAwECHgECF4AWIQTKJixsg95NL7KKMyo6ak24Oeqm1wUC +XVO22wUJB2eGHQAKCRA6ak24Oeqm176hD/9QGNeGm0UX/X8PY6OManUuC5tl/RI2 +xo5ZbckxgSlNKgdhuE9hcrCOX74smdFKkk3EoxfXTa+YaarjXPq+ZfqgOiAk7TyU +BjZiiRiqgg7rWvsUa0ifxP++oN8aV9bTT8+WvkU2nXEPLtvaoSTXn/zE1bv7dIhB +13u2Du3PIVoUQBfcg9tyNkMQ+ifAQxjUghbPKeqsoql1bqY3v561SVg6D+IqeA5s +3Q8xxve4wc8vFgwRsWm4ugFTGRHdLhAFc3LlFxmFDhPMNvQguPh9MifBGthFcHBd +F2lUTdXffhiKpCQ3+qUP/YP0rurL+Ke8aBNBXlU68+2l0JrCjySnDj3a5RKWOgWk +2SSadUia06GGHRBaTVs5AAOfL0vaIbeUMxSv7Itg8jkqH2/9PdoCDOFznNS1C6o+ +MxtPFmjZSGna5wSlyUobCrcRGL1mD5w4r16MKFICSVQM5ns617bm0tWS0qyAARid +Ng3baLoStf64wyk5QUwfVj1huQzRmk7os3OOik44J+nF8BqloW0bAsJ3mFgJVqLW +5U6GpbURaVsnxgnu4VuRedHg/JC1gy7JqNASq3vlExmBJDsNZjgPWKlnUezyxM0+ +UP3OGb4AVPm7yVUZWB3XuPyk2565rOWEFyXy1/oOrHAgijD5d4FPGe4sxy0WH88E +z+nBNcht+1juVw== +=t/sG +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libre/ark/keys/pgp/D81C0CB38EB725EF6691C385BB463350D6EF31EF.asc b/libre/ark/keys/pgp/D81C0CB38EB725EF6691C385BB463350D6EF31EF.asc new file mode 100644 index 0000000..ac8562f --- /dev/null +++ b/libre/ark/keys/pgp/D81C0CB38EB725EF6691C385BB463350D6EF31EF.asc @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFIoa28BEACX3sZB3hjIPlaXouQLMDX7yA5FeVccsyadoNnpJ6q04ZUSYbYW +XvXKkDEK9D8DsQ7cftWcafQqNxamfmqQ5fyXtbQsmWty0MrckcT4pA5OaZlGZIgb +gim4UDOtQF3EYCtw2Mwo4XnSrQtrWv8CWXY1sxCsVf4/txHm/VZ2s8pmT2b0+qVJ +gUeK342Y1sZFoVtADcMCMCtMRi1JwZ5ARthRsLB2y9l5GwsSX30FvIwfGzHOjWWc +5bzuaFIbPTrn8pyCD+FNWuS1Oth8LHDV76N/fbPkgoKk4Zqivb2/NfOlPiG2uPlh +CPUd0ZoSSO4BFxpW/dkAbin5fWDF14cW4tE/P8M2DpUmvLsfrg1LGyyqkzYi9ha+ +HQVHHUC2k8lI+OEIoX+P/4JMK23jrjJdjbtqCRsuEAUGFsXXTf4XTaMi6SQJCaIy +dVy9ehn9f68kCVt9FA/gv4h247wFkTR+RiHMxRZmzI6nNbN8pKAjsKlwh4TdzU7A +DXfPShzafC7cs4fS3nhbqEj8p31t+SYK/XsKl5CTMhZDvRXljPDVfTyLBtQNC1Qj +t8Uo+y9C7afB/W1rhAXb55CdJvvbRN+W+dMOfEpNnJcNCo1ov/dcDW4XhB4ax0Xd +6IR1XCIQ0uJHp9e2hrN2q9tErO7DeqHmnoL9TVBmsj7SAx64c5KLZMWvAwARAQAB +tB5IZWlrbyBCZWNrZXIgPGhlaWtvQHNocnV1Zi5kZT6JAjkEEwECACMFAlIoa28C +GyMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRC7RjNQ1u8x7301D/sGoym9 +VtnwmVis3fXeY0BwjvRSnJ2vGuf9wNjjQNxiSbh61Zx4gV4w1SGL1pttPEj/3Vub +LItXwsH8M2WDFl5gW4b5AGGFdBbBlPlHjcJMILCe9s1ayc0HpeMKf9VkuY93WcTM +2cHQj96oxDyLwWEiaSIoYRHib28X2mYPHctQ307mp8HF3GeFtY9936ZiAfEXLykW +F2f5iSKXKMK8t7P7dgDAUQ+C+IfyYpQLEcGUKMVpCk4ZoTItth56fe6xpwo1PllL +oXgzy6gYQXwrOnM/w3j/1hJQal2o/gUVJzLhrb/zKoEyIhxV+bvgFiSd/ChDkits +x1qf0FMbs3ACPgbCLYjbr8sFMHPQDTw2DmqGCLwEGAh/KEQ+Q2HVLS88glRwVLp2 +O16+26dm3f3DgiElmW3Qf4iMhj/+KGyWUf3eRldg/mTlBc0v8QKhJS8a+Pex6oPO +jIo9+yyuSl2BK8Vvm8MLi5FFM1uLrsMo1plkNdTKUPoNRTCELREAIvq0ICnLit2j +wDT4N5JWWcAZlhYAag7R0gnEOt3VAxCkGDSdS1mMgl5npgesu3T7k+khIEcvaU48 +g7II/q4kgYJvp8iWDwJew+n6PnYv0DjtmXoXISDIkmOESa1Py4M+K28omBu170es +e3CK3LerNbBJSnlZgoYUqQMPGuMFE0mCOb0+8rQjSGVpa28gQmVja2VyIDxoZWly +ZWNrYUBleGhlcmJvLm9yZz6JAjkEEwECACMFAlIobWYCGyMHCwkIBwMCAQYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRC7RjNQ1u8x7+tDEACRF1c9DVGJnubyrF5Aqn9ChCCR +3GS4ynTxmf21xCoARpbbh8edBlzxJ7HNf1+t/0wEcmKGNdaRZUVIyXMCj2Uye6/C +KbmBz0ynHjoRkVSX+imJynJKmKjWsqctRqT67K9pnCB5KIiUK3c3GWrxd2u8dZUJ +pb5XhbWzIDwnR7AdvoT0ytuANbUA5gtwH0WriUQ2qsZK3tzmm0L4EJ07qGXB94WY +VaLrz4+26ja4O/v87Pm0yadGMGjIFkq7u8g7kiME1VPvzjkUwxk3XcDVcFt5Gjct +1beMX/SUt8WLYfL3XUyU8i/UKraf0hPG7TeWpPOvlmfjgMicmfgYDXMyTz3h54GR +G3AvIZA9oMbcsc9SX6+IayWCN4m7j3qZWBbzCtbkXTJU42dHKjnANTRj+5e8RVVa +DaI6WzWW4VCLfJrsVqEJvoJvCBrpfVClV64D/tqiCHNbBpBIcxBJd6i5QceS95EH +BRjCvqeSUNvyVeIFWTBOodycMZufEtCMgPBvzSyT0FUtjk1PtQowe1VA47PiyjIw +7CrcTzfC3KhOb0iXZLPVXZ8+A3Zbgq3iFt8MNj/Wvn+OnvZ6eFtoH5yfqmvrMisM +mRxwMH+sd9WDqIpEf/vQhC54mA9F99dYmqYFJdkfgAaECqdqR+LwbNl8unPs5/BF +gHGN+x6HNq5UXNx+pbkCDQRSKGtvARAAoyoGg3MhkXhQkJqsEsKq+D5mVWwaH4Ah +h3YuujOk+sCdxOonSUPu3HMzQiZsxFrq/sT2QgrY+MIegB0ZtW0BpiacIkZPapgG +xSaAaZv58ICBgvuX5N1CzqKQGjnyN01eyUvN+m1zbqB00iDeJ4MI5BJWipSls0ah +FQqL5ZkFZ7bRDkPdxL7HrBJVs8Q/cs0eV2SaAsVxV4bz1DPdymsZbJnAXz9X/6Tv +Fu+ANDD6XqhhYSsAzrCvkX8VVCBb+gdwFxHU9lrOYGqFL/bG0apNky2DILRCu8y/ +vHhtugRApJiTfvg4UToc9LkaU58gQbwnfP7t13Hz0iVKwyPuluFK+SlrRHOoCmXc +hPwrhLiLWH9gCecxu/hm/uDj/ncNaxg0tU4myRoPBC2PC3c/bNHSLBrt3QXwb/HU +4ot4rV4AYwAgPSTcDMPr/SIs4FsMP2lfWinMsrUO9TkMDVno7PzFncFA/ZCfp0+N +MXbxCF2C8CyaQZHkApuHc1a2FZ3v3KrmqB+/h27UUZmNGHbGOYt0dm/NVHn05NNl +gcNCt1etSkjFLvo+pWCnfqDhTBB+mPm1kW1rm+3X9nzGHfCbMWcy32ya9nDGQ9Y7 +8z5Gupd7CtJwqjFDzR10HqTPiydDriKYXB0guYRiJ7rqea+5LM54l/C+NcfDYpu+ +KzMmvOUCH8UAEQEAAYkCHwQYAQIACQUCUihrbwIbDAAKCRC7RjNQ1u8x7+X5D/46 +greky5mJmwRa2IqZpgk5PE5mN0EueCV3iH1K1jKjU8ZFwEkAG0XGDcPe8nBgXxfN +CnTMayF3xWNWMUrX1WcGD/tEylkWRD3CGVvBS4U0Xym5n7gNhXXOBfLn853eySf9 +0OF6HCp31TWq/jwmjFpG7nvzQSV4CpMWn+LH9WsJ20VsR/k2TxmHtplGfv/zTiU4 +SWjSyjDS1v5JRd04Zxe44tnP1UfikHZCi/HetMV+4iDcp4s0M3/Y5aVtSnAXozAx +3uEXQmDchFFEzG+4myyobj+m/KV6ABGkzXpwH8Tx54U5wTxuhklj0bmLZwwN2xpV +fljZWtJNc9ZglS8PRLulu3Z8bVQOTnnuoyZxP7+9R5XhDY/SA2vj7n/w5F6lnqjy +b8FsXr2qiEl2E0+xAa6UEku9zGgWPNTHZmmtiDKsqhlNW4eAphMvZFqC+6i7vRVV +9moZ+8ueD0rMrVdP53th/W/R9cQtf/swwtof79ERqObC9Ur3/yy/CCNPI+Dj1qqM +ZsFEKALVipcexKbqGhQfKYwwaKgDSe8mVHc/JbTwof2rmPxbmBNQWVgHwRVUGB63 +Jnn9afS3SYEBTAz/f4S6TAM30VL2To6H+vKtc4ZPtzRIQD5dU3SDWT4qGMusAgSl +rG55+BcCqtgEEF7/JbOUHbLUu8+g/F2rZpAbsr5V8g== +=P9hR +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libre/ark/keys/pgp/F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87.asc b/libre/ark/keys/pgp/F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87.asc new file mode 100644 index 0000000..ea1f1fc --- /dev/null +++ b/libre/ark/keys/pgp/F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87.asc @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFlRpEYBCACecX3F5xzF6wzeXiuBAuHq74bVHON7I89U+ROloEWYUYMRNTz2 +l1BkNHWRTTqfmPO7LhMY6g4gOPeQVCwgTGVjI8bn6sJd3SFdeiRvvaFBpmn7SjBd +s1rkKKJIjeMUl1w8dFnmf22V0PnhSSepmNwmd8RQnl1umCTSihDJydGxixw6ZNhr +4tzbn+Rfadybli61H2hc6/JJHe91i+V1ltgkHwGcs6MUCqXgSL0dUIJs49gSrla0 +gkrcJYF5MWyGxKlajbCjkMCJtN+8bhEmpc4Oe8NZ33arEWnlyh1RVgi5p3RTNApY +Pxctcg57ExczbKn9R8VLYmPJ7Di3gX0cmotrABEBAAG0HkNocmlzdG9waCBGZWNr +IDxjZmVja0BrZGUub3JnPokBTgQTAQgAOBYhBPIydeS/EK/B32kUptvSzok+LRyH +BQJZUaRGAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJENvSzok+LRyHeWcH +/A1E2d5UL2oHsrLIolIiWMmheRorcac+0Hgll1mMUQ5tfPH+LVzgrlMMG7g1Amky +Hk1qZ5oszrXUg2H/28/cOF/WVlHgQcSGr7aQbHieUivPtZMua+lHUdILC3UV2l1V +22Zz8HIDl4kxmK6EpoNIOK5Mo550S3e3AKYq5pa/FlckCV9/JoK9+thRCsoAAj3g +oWwTx9RY5pmLPtklqyC5961Je7KHSIVqapJ/G5DX+yfOC1Psc+vIfyQVqnaefZPW +dIxXQQhn46i6IRRimw94Gkwca+wslkimt/L/Z7ByZqBsXMyixSQPq+dtSO9CMgr0 +WxTX78wATkTGzh5oSwKCMga5AQ0EWVGkRgEIAMuUnfNfrdx8xn7Jjcm6MGkB/Yep +XVysrlHxUUS6q7629JdSlVWnQo9GFO927GZClWI9rCGLQMfZZk/jfgKV/nkpLod3 +I51remOg7ohSkwRLAdwJ7xCuNrafhKntFh5/NxuaXxaVIY1muvZbTAsIRyks2jCE +pUoK43Z8dr4/QPhBstssB8czDME1Tw4r7X+RwjFrQqDItFv6f0BIdEwR462khLEw +vbXRN1nzs+6Y0foJbJCS3VDZC9scsrrMVMV+OEBF3DXp9ypSWsLnkuBPPIus6Y8G +j7JvYUBtrUhKL5a7o5G3Te9YhwGgOKVqWlncs6ZLiOV6HnG0BO3xdPcn09cAEQEA +AYkBNgQYAQgAIBYhBPIydeS/EK/B32kUptvSzok+LRyHBQJZUaRGAhsMAAoJENvS +zok+LRyHaRMIAI5YaTfGeQDmR08I2LvztOEH/3YF63cNCP/Vp+WAtF/Kr8mMFpFS +oTHJNMi7p964lHYTTPzPeQzLzV3ayiQjq+DHs6HFmYl73ukzlGGc7KDlyhugQjm6 +AqNtqqXAVykaixnFj8jf2WtQGl1hqpm8GhDRBmZycqMqne4tZokujhtpdC6suRvc +AB0S+lRZUwrY05k6Nc1A8J8k/lxXXa9KzXNaqKsqppgBZoqKN3zS4146uEjvuLsh +CarZ/6uUidvP0LBTR7HKye5A9Qdbjlg9qvtR7YF3hqy4g1PRNZWRlsQ1pkCdCTfN +TA+HYUzK0ESVpY72lWvH49lNg+ufZ1bKvKI= +=MZJ5 +-----END PGP PUBLIC KEY BLOCK----- From 10172331c70a09aae861964d694acbcd99b8df46 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 07 2024 22:22:54 +0000 Subject: [PATCH 26/73] libre/grub: delete unused files --- diff --git a/libre/grub/09_parabola b/libre/grub/09_parabola deleted file mode 100644 index 90a9062..0000000 --- a/libre/grub/09_parabola +++ /dev/null @@ -1,195 +0,0 @@ -#!/usr/bin/env bash - -## -## grub-mkconfig helper script specific to Parabola GNU/Linux-libre -## Contributed by "Keshav Amburay" -## Rebranded for Parabola by "André Silva" -## Updated on 08 February 2014 -## -## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script -## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream -## -## This script can be freely distributed and/or modified -## under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This script is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -_FUNC_GRUB_FILE_PRESENT() { - - [[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86" - - if [[ "${GRUB_PLATFORM}" == "x86" ]]; then - check="--is-x86-linux32" - elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then - check="--is-i386-xen-pae-domu" - elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then - check="--is-x86_64-xen-domu" - else - check="--is-${GRUB_PLATFORM}-linux" - fi - - case "${GRUB_PLATFORM}" in - x86) - list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do - if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi - done)" ;; - *) - list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do - if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi - done)" ;; - esac -} - -set -e - -prefix="/usr" -exec_prefix="${prefix}" -datarootdir="/usr/share" -datadir="${datarootdir}" -sysconfdir="/etc" - -. "${datarootdir}/grub/grub-mkconfig_lib" - -. "${sysconfdir}/default/grub" - -export TEXTDOMAIN="grub" -export TEXTDOMAINDIR="${datarootdir}/locale" - -CLASS="--class parabola --class gnu-linux --class gnu --class os" - -[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT - -BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)" -BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null || true)" -BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)" - -ROOT_PART_GRUB_DEVICE="$(${grub_probe} --target=device / || true)" -ROOT_PART_FS="$(${grub_probe} --device ${ROOT_PART_GRUB_DEVICE} --target=fs 2> /dev/null || echo "unknown")" - -if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then - - case "${ROOT_PART_FS}" in - btrfs) - rootsubvol="$(make_system_path_relative_to_its_root /)" - rootsubvol="${rootsubvol#/}" - if [[ "${rootsubvol}" != "" ]]; then - GRUB_LINUX_ROOT_DEVICE="subvol=${rootsubvol}" - fi - ;; - zfs) - rpool="$(${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true)" - bootfs="$(make_system_path_relative_to_its_root / | sed -e "s,@$,,")" - GRUB_LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" - ;; - esac - - if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \ - [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \ - [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \ - uses_abstraction "${GRUB_DEVICE}" lvm ; then - GRUB_LINUX_ROOT_DEVICE="${GRUB_DEVICE}" - else - GRUB_LINUX_ROOT_DEVICE="UUID=${GRUB_DEVICE_UUID}" - fi -fi - -[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - -for _KERNEL_ in ${list} ; do - - echo "Found linux image: ${_KERNEL_}" >&2 - - basename="$(basename "${_KERNEL_}")" - dirname="$(dirname "${_KERNEL_}")" - REAL_DIR="$(make_system_path_relative_to_its_root "${dirname}")" - - _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')" - _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')" - - _INITRAMFS_="${_KERNEL_FILE_/vmlinuz-/initramfs-}.img" - - if [[ -e "/boot/${_INITRAMFS_}" ]]; then - - echo "Found initramfs image: /boot/${_INITRAMFS_}" >&2 - -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel initramfs ...' - initrd ${REAL_DIR}/${_INITRAMFS_} -} - -EOF - fi - - _INITRAMFS_FALLBACK_="${_KERNEL_FILE_/vmlinuz-/initramfs-}-fallback.img" - - if [[ -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then - - echo "Found fallback initramfs image: /boot/${_INITRAMFS_FALLBACK_}" >&2 - -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel fallback initramfs ...' - initrd ${REAL_DIR}/${_INITRAMFS_FALLBACK_} -} - -EOF - fi - - if [[ ! -e "/boot/${_INITRAMFS_}" ]] && [[ ! -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} -} - -EOF - fi - -done diff --git a/libre/grub/arm-extra b/libre/grub/arm-extra deleted file mode 100644 index 87d4aa8..0000000 --- a/libre/grub/arm-extra +++ /dev/null @@ -1,333 +0,0 @@ -### ARM_UBOOT - loadaddr ### -# 0x00007fc0 - versatile[versatile_ab/versatile_pb] -# 0x00100000 - snowball/u8500_href -# 0x00800000 - dns325/highbank/wireless_space -# 0x02000000 - zynq[zynq_microzed/zynq_picozed/zynq_zc702/zynq_zc706/zynq_zc70x/zynq_zc770[zynq_zc770_xm010/zynq_zc770_xm012/zynq_zc770_xm013]/zynq_zed/zynq_zybo] -# 0x08000000 - grub -# 0x10800000 - cm_fx6 -# 0x12000000 - aristainetos[aristainetos/aristainetos2]/mx6[mx6slevk/mx6sxsabresd] -# 0x40007000 - origen -# 0x43e00000 - origen -# 0x60008000 - vexpress_ca9x4 -# 0x70800000 - ima3-mx53/mx53evk/mx53smd -# 0x72000000 - mx53ard/mx53loco -# 0x80000000 - am335x_bur[kwb/tseries]/am3517[am3517_crane/am3517_evm]/mcx -# 0x80007fc0 - am335x_ti[pcm051] -# 0x80008000 - vexpress_ca9x4/vexpress[vexpress_ca15_tc2/vexpress_ca5x2](extended-mem) -# 0x80100000 - am335x_bur[kwb]/ls2085a[ls2085a_emu/ls2085a_simu/ls2085aqds/ls2085ardb] -# 0x80200000 - am335x_bur[tseries]/am335x_ti[am335x_evm/omap3_beagle/pengwyn]/ti814x_evm -# 0x80800000 - * flea3/mx31ads/mx35pdk/qong/woodburn/woodburn_sd -# 0x81000000 - ti814x_evm * mx25pdk/omap3_logic/ti816x_evm/tx25 -# 0x82000000 - am335x_ti[am335x_evm/omap3_beagle/pcm051/pengwyn]/am3517[am3517_crane/am3517_evm]/mcx -# /mx6[gw_ventana[gwventana]/mx6cuboxi/mx6qarm2[mx6dlarm2]/mx6qsabreauto[mx6dlsabreauto]/mx6sabresd[mx6dlsabresd/mx6qsabresd]] -# /omap3_ti[devkit8000] -# * bav335x/cm_t335/cm_t3517/dig297/omap3_evm/omap3_igep00x0/omap3_mvblx/omap3_sdp3430/omap3_zoom1/tao3530 -# 0x84000000 - am335x_baltos -# 0x90000000 - vexpress64_base[vexpress_aemv8a_semi]/vexpress64_juno[vexpress_aemv8a_juno] -# 0x90000000UL - ls2085a[ls2085a_emu/ls2085a_simu/ls2085aqds/ls2085ardb] -# 0x90800000 - vision2 -# 0x92000000 - mx51evk -# 0xa0008000 - vexpress[vexpress_ca15_tc2/vexpress_ca5x2](extended-mem) -# 0xa0800000 - imx27lite -# 0xc0000014 - davinci[ea20] -# 0xc0700000 - davinci[ea20] -# 0x12000000 - udoo_dl udoo_quad - -# alt -# am335x_igep0033 -# am43xx_evm -# apalis_t30 -# apf27 -# apx4devkit -# armadillo-800eva -# arndale -# aspenite -# at91rm9200ek -# at91sam9260ek at91sam9g20ek/at91sam9xeek -# at91sam9261ek at91sam9g10ek -# at91sam9263ek -# at91sam9m10g45ek -# at91sam9n12ek -# at91sam9rlek -# at91sam9x5ek -# balloon3 -# bav335x birdland_bav335a/birdland_bav335b -# bcm28155_ap bcm11130/bcm28155_w1d -# bcmcygnus bcm911360/bcm911360k/bcm958300k/bcm958305k -# bcmnsp bcm958622hr -# beagle_x15 -# beaver -# bg0900 -# calimain -# cam_enc_4xx -# cardhu -# cgtqmx6eval cgtqmx6qeval -# cm_t335 -# cm_t3517 -# cm_t35 -# cm_t54 -# colibri_pxa270 -# colibri_t20 -# colibri_t30 -# colibri_vf -# corvus -# cpu9260 cpu9G20 -# cpuat91 -# da830evm -# da850evm da850_am18xxevm -# dalmore -# davinci_dm355evm -# davinci_dm355leopard -# davinci_dm365evm -# davinci_dm6467evm davinci_dm6467Tevm -# davinci_dvevm -# davinci_schmoogie -# davinci_sffsdr -# davinci_sonata -# db-88f6820-gp -# db-mv784mp-gp -# devkit3250 -# devkit8000 -# dig297 -# dockstar -# dra7xx_evm -# draco -# dreamplug -# duovero -# eb_cpux9k2 -# eco5pk -# edb93xx edb9315a -# edminiv2 -# embestmx6boards marsboard/riotboard -# enbw_cmc -# ethernut5 -# flea3 -# goflexhome -# gose -# gplugd -# guruplug -# h2200 -# harmony -# ib62x0 -# iconnect -# imx27lite -# imx31_litekit -# imx31_phycore -# integrator_ap integratorap_cm720t/integratorap_cm920t/integratorap_cm926ej_s/integratorap_cm946es -# integrator_cp integratorcp_cm1136/integratorcp_cm920t/integratorcp_cm926ej_s/integratorcp_cm946es -# ipam390 -# jetson-tk1 -# jornada -# k2e_evm -# k2hk_evm -# k2l_evm -# km_kirkwood kmcoge5un/kmnusa/kmsugp1/kmsuv31/mgcoge3un/portl2 -# koelsch -# kosagi_novena novena -# kzm9g -# lager -# lp8x4x -# ls1021aqds -# ls1021atwr -# lsxl lschlv2/lsxhl -# magnesium -# maxbcm -# mcx -# medcom-wide -# meesc -# m28evk -# m53evk -# mt_ventoux -# mv88f6281gtw_ge -# mx23_olinuxino -# mx23evk -# mx25pdk -# mx28evk -# mx31ads -# mx31pdk -# mx35pdk -# mx51_efikamx mx51_efikasb -# mx51evk -# nas220 -# net2big_v2 d2net_v2 -# netspace_v2 inetspace_v2/netspace_lite_v2/netspace_max_v2/netspace_mini_v2 -# nitrogen6x mx6qsabrelite/nitrogen6dl2g/nitrogen6dl/nitrogen6q2g/nitrogen6q/nitrogen6s1g/nitrogen6s -# nokia_rx51 -# nomadik_nhk8815 -# nyan-big -# odroid -# odroid-xu3 -# omap3_cairo cairo -# omap3_evm -# omap3_evm_quick -# omap3_igep00x0 igep0020/igep0030/igep0032 -# omap3_logic -# omap3_mvblx -# omap3_overo -# omap3_pandora -# omap3_sdp3430 -# omap3_zoom1 -# omap4_panda -# omap4_sdp4430 -# omap5_uevm -# omapl138_lcdk -# openrd -# origen -# ot1200 -# otc570 -# palmld -# palmtreo680 -# paz00 -# peach-pi -# peach-pit -# pengwyn -# pepper -# platinum_picon -# platinum_titanium -# plutux -# pm9261 -# pm9263 -# pm9g45 -# pogo_e02 -# porter -# pxa255_idp -# pxm2 -# qong -# rastaban -# rd6281a -# rpi_2 -# rpi -# rut -# s5p_goni -# s5pc210_universal -# sama5d3_xplained -# sama5d3xek -# sama5d4_xplained -# sama5d4ek -# sansa_fuze_plus -# sc_sps_1 -# scb9328 -# seaboard -# secomx6 secomx6quq7 -# sheevaplug -# silk -# smdk2410 -# smdk5250 -# smdk5420 -# smdkc100 -# smdkv310 -# snapper9260 snapper9g20 -# snow -# socfpga_arria5 -# socfpga_cyclone5 socfpga_socrates -# spear300 -# spear310 -# spear320 -# spear600 -# stamp9g20 portuxg20 -# stm32f429-discovery -# stv0991 -# sun4i-a10-a1000(mele) -# sun4i-a10-ba10-tvbox -# sun4i-a10-chuwi-v7-cw0825 -# sun4i-a10-cubieboard -# sun4i-a10-gemei-g9 -# sun4i-a10-hyundai-a7hd -# sun4i-a10-inet-3f -# sun4i-a10-inet-3w -# sun4i-a10-jesurun-q5 -# sun4i-a10-marsboard -# sun4i-a10-mini-xplus -# sun4i-a10-mk802 -# sun4i-a10-mk802ii -# sun4i-a10-olinuxino-lime -# sun4i-a10-pcduino -# sun5i-a10s-auxtek-t004 -# sun5i-a10s-mk802 -# sun5i-a10s-olinuxino-micro -# sun5i-a10s-r7-tv-dongle -# sun5i-a13-ampe-a76 -# sun5i-a13-forfun-q88db -# sun5i-a13-inet-86vs -# sun5i-a13-olinuxino -# sun5i-a13-olinuxino-micro -# sun5i-a13-tzx-q8-713b7 -# sun5i-a13-utoo-p66 -# sun6i-a31-colombus -# sun6i-a31-hummingbird -# sun6i-a31-i7(mele) -# sun6i-a31-m9(mele) -# sun6i-a31-mele-a1000g-quad -# sun6i-a31-mixtile-loftq -# sun6i-a31s-cs908 -# sun6i-a31s-primo81(msi) -# sun7i-a20-ainol-aw1 -# sun7i-a20-bananapi -# sun7i-a20-bananapro -# sun7i-a20-cubieboard2 -# sun7i-a20-cubietruck -# sun7i-a20-i12-tvbox -# sun7i-a20-m3(mele) -# sun7i-a20-m5(mele) -# sun7i-a20-mk808c -# sun7i-a20-olinuxino-lime -# sun7i-a20-olinuxino-lime2 -# sun7i-a20-olinuxino-micro -# sun7i-a20-orangepi -# sun7i-a20-orangepi-mini -# sun7i-a20-pcduino3 -# sun7i-a20-pcduino3-nano -# sun7i-a20-primo73(msi) -# sun7i-a20-wexler-tab7200 -# sun7i-a20-wits-pro-a20-dkt -# sun7i-a20-yones-toptech-bd1078 -# sun8i-a23-ippo-q8h-v1.2 -# sun8i-a23-ippo-q8h-v5 -# sun8i-a33-et-q8-v1.6 -# sun8i-a33-ga10h-v1.1 -# sun8i-a33-ippo-q8h-v1.2 -# sun8i-a33-sinlinx-sina33 -# sun9i-a80-optimus(merri) -# tao3530 omap3_ha -# taurus axm -# tbs2910 -# tec -# tec-ng -# thuban -# ti814x_evm -# ti816x_evm -# titanium -# tk71 -# tqma6 tqma6q_mba6/tqma6s_mba6 -# trats -# trats2 -# tricorder -# trimslice -# trizepsiv polaris -# tseries -# tt01 -# twister -# tx25 -# uniphier-ph1-ld4-ref -# uniphier-ph1-pro4-ref -# uniphier-ph1-sld8-ref -# usb_a9263 -# usbarmory -# VCMA9 -# venice2 -# ventana -# vf610twr -# vl_ma2sc -# vpac270 -# wandboard -# warp -# whistler -# woodburn -# woodburn_sd -# work_92105 -# x600 -# xaeniax -# xfi3 -# xilinx_zynqmp -# zipitz2 -# zmx25 From 3588fef4dad7bbb21bc93b10757a61c41c733809 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 07 2024 22:22:54 +0000 Subject: [PATCH 27/73] libre/grub: add a comment about differences from Arch --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 1b031ac..b3b6deb 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -6,6 +6,52 @@ # Contributor: Márcio Silva # Maintainer: Omar Vega Ramos +# Differences from Arch's `core/grub`: +# +# - Branded for Parabola, not Arch +# +# - Add arch+=(i686) +# +# - Add arch+=(armv7h) +# +# - Add more platforms: +# +# + Arch starts with: +# +# * --with-platform=pc (x86 BIOS) +# * --with-platform=efi (UEFI, x86 and ARM; if +# _IA32_EFI_IN_ARCH_X86=1 then the x86_64 +# package contains both 32bit and 64bit +# builds) +# * --with-platform=emu (if _GRUB_EMU_BUILD=1, user-mode, x86 and ARM) +# +# + Parabola additions, since +# +# "grub: add armv7h support (U-Boot and UEFI)" +# (2015-09-26, Márcio Alexandre Silva Delgado ) +# +# * --with-platform=uboot (ARM) +# +# + Parabola additions, since +# +# "grub: rm unused grub-extras in U-Boot, fix msg on U-Boot build; add IEEE1275 (OpenFirmware) and Libreboot support" +# (2015-09-26, Márcio Alexandre Silva Delgado ) +# +# * --with-platform=ieee1275 (OpenFirmware, x86-only) +# * --with-platform=coreboot (Libreboot, x86-only) +# +# + Parabola additions, since +# +# "grub: add QEMU, XEN and Multiboot support" +# (2015-09-27, Márcio Alexandre Silva Delgado ) +# +# * --with-platform=xen (if _XEN=1, x86-only; if +# _IA32_XEN_IN_ARCH_X86=1 then the x86_64 +# package contains both 32bit and 64bit +# builds) +# * --with-platform=qemu (a separate -kernel file for Qemu, x86-only) +# * --with-platform=multiboot (x86-only) + ## '1' to enable Xen support, '0' to disable _XEN='0' @@ -15,7 +61,7 @@ _IA32_EFI_IN_ARCH_X64='1' ## '1' to enable IA32-XEN build in Arch x86_64, "0" to disable _IA32_XEN_IN_ARCH_X64='1' -## '1' to enable EMU build (x86_64 and i686 only), "0" to disable +## '1' to enable EMU build, "0" to disable _GRUB_EMU_BUILD='0' [[ "${CARCH}" = 'armv7h' ]] && _EFI_ARCH='arm' From b04dc7f90e0eab051f49d61637d33658e011b151 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 07 2024 22:22:54 +0000 Subject: [PATCH 28/73] libre/grub: rename the patch files to have obvious ordering/purpose --- diff --git a/libre/grub/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch b/libre/grub/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch new file mode 100644 index 0000000..3ae7d95 --- /dev/null +++ b/libre/grub/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch @@ -0,0 +1,138 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-17 13:39:03.509682976 -0500 +@@ -91,10 +91,14 @@ + fi + if [ x$type != xsimple ] ; then + case $type in ++ booster) ++ title="$(gettext_printf "%s, %s kernel (booster initramfs)" "${os}" "${version}")" ;; ++ fallback) ++ title="$(gettext_printf "%s, %s kernel (fallback initramfs)" "${os}" "${version}")" ;; + recovery) +- title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; ++ title="$(gettext_printf "%s, %s kernel (recovery mode)" "${os}" "${version}")" ;; + *) +- title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; ++ title="$(gettext_printf "%s, %s kernel" "${os}" "${version}")" ;; + esac + if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then + replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" +@@ -106,7 +110,7 @@ + else + echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi +- if [ x$type != xrecovery ] ; then ++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then + save_default_entry | grub_add_tab + fi + +@@ -138,7 +142,7 @@ + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + fi +- message="$(gettext_printf "Loading Linux %s ..." ${version})" ++ message="$(gettext_printf "Loading %s kernel ..." ${version})" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +@@ -198,7 +202,7 @@ + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` +- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` ++ version=`echo $basename | sed -e "s,vmlinuz-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + +@@ -285,6 +289,29 @@ + + linux_entry "${OS}" "${version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ ++ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then ++ initrd="${initrd_early} initramfs-${version}-fallback.img" ++ ++ if test -n "${initrd}" ; then ++ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 ++ fi ++ ++ linux_entry "${OS}" "${version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ ++ if test -e "${dirname}/booster-${version}.img" ; then ++ initrd="${initrd_early} booster-${version}.img" ++ ++ if test -n "${initrd}" ; then ++ gettext_printf "Found booster initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2 ++ fi ++ ++ linux_entry "${OS}" "${version}" booster \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-17 03:22:43.732079272 -0500 +@@ -117,9 +117,11 @@ + fi + if [ x$type != xsimple ] ; then + if [ x$type = xrecovery ] ; then +- title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel (recovery mode)" "${os}" "${xen_version}" "${version}")" ++ elif [ x$type = xfallback ] ; then ++ title="$(gettext_printf "%s, with Xen %s and %s kernel (fallback initramfs)" "${os}" "${xen_version}" "${version}")" + else +- title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel" "${os}" "${xen_version}" "${version}")" + fi + replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" + if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then +@@ -132,7 +134,7 @@ + title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" + echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi +- if [ x$type != xrecovery ] ; then ++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then + save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" + fi + +@@ -141,7 +143,7 @@ + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" +- lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" ++ lmessage="$(gettext_printf "Loading %s kernel ..." ${version})" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$xmessage" | grub_quote)' + if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then +@@ -275,7 +277,7 @@ + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` +- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` ++ version=`echo $basename | sed -e "s,vmlinuz-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + +@@ -341,6 +343,18 @@ + + linux_entry "${OS}" "${version}" "${xen_version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" ++ ++ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then ++ initrd="initramfs-${version}-fallback.img" ++ ++ if test -n "${initrd}" ; then ++ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 ++ fi ++ ++ linux_entry "${OS}" "${version}" "${xen_version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" "${xen_version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch deleted file mode 100644 index eac637d..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:16:38.219592837 -0500 -@@ -155,6 +155,25 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb -+EOF -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb -+EOF -+ fi -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +280,16 @@ - fi - fi - -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 -+ fi -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:23:54.679591971 -0500 -@@ -172,6 +172,25 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb -+EOF -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb -+EOF -+ fi -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +335,16 @@ - fi - fi - -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 -+ fi -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch deleted file mode 100644 index 71d04cb..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:35:47.579590557 -0500 -@@ -155,6 +155,14 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +269,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:38:28.569590238 -0500 -@@ -172,6 +172,14 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +324,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch deleted file mode 100644 index 3ba413c..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:45:30.129589402 -0500 -@@ -155,6 +155,14 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +269,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:46:39.199589265 -0500 -@@ -172,6 +172,14 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +324,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch deleted file mode 100644 index f24eed1..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:52:13.679588602 -0500 -@@ -155,6 +155,14 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +269,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:53:25.419588460 -0500 -@@ -172,6 +172,14 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +324,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch deleted file mode 100644 index 3ae7d95..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-17 13:39:03.509682976 -0500 -@@ -91,10 +91,14 @@ - fi - if [ x$type != xsimple ] ; then - case $type in -+ booster) -+ title="$(gettext_printf "%s, %s kernel (booster initramfs)" "${os}" "${version}")" ;; -+ fallback) -+ title="$(gettext_printf "%s, %s kernel (fallback initramfs)" "${os}" "${version}")" ;; - recovery) -- title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; -+ title="$(gettext_printf "%s, %s kernel (recovery mode)" "${os}" "${version}")" ;; - *) -- title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; -+ title="$(gettext_printf "%s, %s kernel" "${os}" "${version}")" ;; - esac - if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then - replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" -@@ -106,7 +110,7 @@ - else - echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - fi -- if [ x$type != xrecovery ] ; then -+ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then - save_default_entry | grub_add_tab - fi - -@@ -138,7 +142,7 @@ - fi - printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - fi -- message="$(gettext_printf "Loading Linux %s ..." ${version})" -+ message="$(gettext_printf "Loading %s kernel ..." ${version})" - sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$message" | grub_quote)' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -198,7 +202,7 @@ - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` -- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` -+ version=`echo $basename | sed -e "s,vmlinuz-,,g"` - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - -@@ -285,6 +289,29 @@ - - linux_entry "${OS}" "${version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ -+ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then -+ initrd="${initrd_early} initramfs-${version}-fallback.img" -+ -+ if test -n "${initrd}" ; then -+ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 -+ fi -+ -+ linux_entry "${OS}" "${version}" fallback \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ fi -+ -+ if test -e "${dirname}/booster-${version}.img" ; then -+ initrd="${initrd_early} booster-${version}.img" -+ -+ if test -n "${initrd}" ; then -+ gettext_printf "Found booster initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2 -+ fi -+ -+ linux_entry "${OS}" "${version}" booster \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ fi -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-17 03:22:43.732079272 -0500 -@@ -117,9 +117,11 @@ - fi - if [ x$type != xsimple ] ; then - if [ x$type = xrecovery ] ; then -- title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" -+ title="$(gettext_printf "%s, with Xen %s and %s kernel (recovery mode)" "${os}" "${xen_version}" "${version}")" -+ elif [ x$type = xfallback ] ; then -+ title="$(gettext_printf "%s, with Xen %s and %s kernel (fallback initramfs)" "${os}" "${xen_version}" "${version}")" - else -- title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" -+ title="$(gettext_printf "%s, with Xen %s and %s kernel" "${os}" "${xen_version}" "${version}")" - fi - replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" - if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then -@@ -132,7 +134,7 @@ - title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" - echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - fi -- if [ x$type != xrecovery ] ; then -+ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then - save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" - fi - -@@ -141,7 +143,7 @@ - fi - printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" -- lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" -+ lmessage="$(gettext_printf "Loading %s kernel ..." ${version})" - sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$xmessage" | grub_quote)' - if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then -@@ -275,7 +277,7 @@ - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` -- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` -+ version=`echo $basename | sed -e "s,vmlinuz-,,g"` - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - -@@ -341,6 +343,18 @@ - - linux_entry "${OS}" "${version}" "${xen_version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" -+ -+ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then -+ initrd="initramfs-${version}-fallback.img" -+ -+ if test -n "${initrd}" ; then -+ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 -+ fi -+ -+ linux_entry "${OS}" "${version}" "${xen_version}" fallback \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" -+ fi -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" "${xen_version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch deleted file mode 100644 index 692ac51..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:58:17.879587880 -0500 -@@ -155,6 +155,14 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +269,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:59:12.559587771 -0500 -@@ -172,6 +172,14 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +324,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..eac637d --- /dev/null +++ b/libre/grub/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,90 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:16:38.219592837 -0500 +@@ -155,6 +155,25 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then ++ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree file ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb ++EOF ++ fi ++ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then ++ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree file ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb ++EOF ++ fi ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +280,16 @@ + fi + fi + ++ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then ++ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then ++ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 ++ fi ++ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then ++ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then ++ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 ++ fi ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:23:54.679591971 -0500 +@@ -172,6 +172,25 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then ++ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree file ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb ++EOF ++ fi ++ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then ++ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree file ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb ++EOF ++ fi ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +335,16 @@ + fi + fi + ++ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then ++ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then ++ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 ++ fi ++ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then ++ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then ++ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 ++ fi ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..71d04cb --- /dev/null +++ b/libre/grub/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,56 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:35:47.579590557 -0500 +@@ -155,6 +155,14 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +269,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:38:28.569590238 -0500 +@@ -172,6 +172,14 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +324,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..3ba413c --- /dev/null +++ b/libre/grub/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,56 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:45:30.129589402 -0500 +@@ -155,6 +155,14 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +269,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:46:39.199589265 -0500 +@@ -172,6 +172,14 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +324,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..f24eed1 --- /dev/null +++ b/libre/grub/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,56 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:52:13.679588602 -0500 +@@ -155,6 +155,14 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +269,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:53:25.419588460 -0500 +@@ -172,6 +172,14 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +324,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..692ac51 --- /dev/null +++ b/libre/grub/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,56 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:58:17.879587880 -0500 +@@ -155,6 +155,14 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +269,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:59:12.559587771 -0500 +@@ -172,6 +172,14 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +324,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index b3b6deb..e62d748 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -128,29 +128,30 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed" "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}" "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig} - '0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch' '0001-00_header-add-GRUB_COLOR_-variables.patch' - 'grub.default' - '0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch' - '0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch' - '0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch' - '0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch' - '0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch' - '0003-10_linux-20_linux_xen-rebrand-free-distros.patch') + '0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch' + '0003-10_linux-20_linux_xen-rebrand-free-distros.patch' + 'grub.default') +source_armv7h=( + '1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch' + '1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch' + '1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch' + '1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch' + '1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch') sha256sums=('SKIP' 'SKIP' 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5' 'SKIP' - 'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f' '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' - 'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879' - '0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32' - 'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87' - 'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56' - 'f5fb1673536d56a88b3d1aaec75501e4d0acca081ac658d1059ec276f9e062c6' - 'd8911a513166d2db337b9449542e0ad0e91b114f92dc4b876d88d77d23829a1d' - '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4') + 'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f' + '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4' + 'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879') +sha256sums_armv7h=('0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32' + 'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87' + 'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56' + 'f5fb1673536d56a88b3d1aaec75501e4d0acca081ac658d1059ec276f9e062c6' + 'd8911a513166d2db337b9449542e0ad0e91b114f92dc4b876d88d77d23829a1d') _backports=( ) @@ -192,7 +193,7 @@ prepare() { patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" echo "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig..." - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch" + patch -Np1 -i "${srcdir}/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch" echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..." sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac" @@ -716,7 +717,7 @@ package_grub-am335x_bone() { cd "${srcdir}/grub-uboot_am335x-bone/" echo 'Patch to detect am335x-bone device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch" + patch -Np1 -i "${srcdir}/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch" echo 'Package grub U-Boot stuff...' ## _package_grub-uboot @@ -731,10 +732,6 @@ package_grub-am335x_bone() { echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## echo 'Patch to detect am335x-bone device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch" } package_grub-omap3_beagle() { @@ -749,7 +746,7 @@ package_grub-omap3_beagle() { cd "${srcdir}/grub-uboot_omap3_beagle/" echo 'Patch to detect omap3_beagle device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch" + patch -Np1 -i "${srcdir}/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch" echo 'Package grub U-Boot stuff...' ## _package_grub-uboot @@ -764,10 +761,6 @@ package_grub-omap3_beagle() { echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## echo 'Patch to detect omap3_beagle device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch" } package_grub-omap3_beagle_xm() { @@ -782,7 +775,7 @@ package_grub-omap3_beagle_xm() { cd "${srcdir}/grub-uboot_omap3_beagle_xm/" echo 'Patch to detect omap3_beagle_xm device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch" + patch -Np1 -i "${srcdir}/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch" echo 'Package grub U-Boot stuff...' ## _package_grub-uboot @@ -797,10 +790,6 @@ package_grub-omap3_beagle_xm() { echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## echo 'Patch to detect omap3_beagle_xm device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch" } package_grub-omap3_beagle_xm_ab() { @@ -815,7 +804,7 @@ package_grub-omap3_beagle_xm_ab() { cd "${srcdir}/grub-uboot_omap3_beagle_xm_ab/" echo 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch" + patch -Np1 -i "${srcdir}/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch" echo 'Package grub U-Boot stuff...' ## _package_grub-uboot @@ -830,10 +819,6 @@ package_grub-omap3_beagle_xm_ab() { echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## echo 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch" } package_grub-udoo() { @@ -847,7 +832,7 @@ package_grub-udoo() { cd "${srcdir}/grub-uboot_udoo/" echo 'Patch to detect udoo device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch" + patch -Np1 -i "${srcdir}/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch" echo 'Package grub U-Boot stuff...' ## _package_grub-uboot @@ -862,8 +847,4 @@ package_grub-udoo() { echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## echo 'Patch to detect udoo device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch" } From dbc32760f6d1cb21ddce5ba8c0b60a29c6fd6681 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:17:33 +0000 Subject: [PATCH 29/73] libre/grub: factor out the common part of the arm-uboot package_* functions --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index e62d748..2f408e0 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -706,18 +706,21 @@ package_grub() { install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" } -package_grub-am335x_bone() { - pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBone and BeagleBone Black (am335x-bone), (Parabola rebranded)' +_package_grub-uboot-dev() { + local devname=$1 + local devdesc=$2 + + pkgdesc="GNU GRand Unified Bootloader (2) for $devdesc ($devname), (Parabola rebranded)" optdepends+=('dosfstools: For grub-mkrescue FAT FS' 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' 'mtools: For grub-mkrescue FAT FS support') - echo "Copy the source for packaging the U-Boot (am335x-bone) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_am335x-bone/" - cd "${srcdir}/grub-uboot_am335x-bone/" + echo "Copy the source for packaging the U-Boot ($devname) part..." + cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_$devname/" + cd "${srcdir}/grub-uboot_$devname/" - echo 'Patch to detect am335x-bone device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch" + echo "Patch to detect $devname device tree blob file (dtb)..." + patch -Np1 -i "${srcdir}/1000-${pkgname#grub-}--10_linux-20_linux_xen-detect-devicetree-file.patch" echo 'Package grub U-Boot stuff...' ## _package_grub-uboot @@ -734,117 +737,25 @@ package_grub-am335x_bone() { install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" } +package_grub-am335x_bone() { + _package_grub-uboot-dev 'am335x-bone' 'BeagleBone and BeagleBone Black' +} + package_grub-omap3_beagle() { - pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard (omap3_beagle), (Parabola rebranded)' provides+=('grub-beagleboard') - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - - echo "Copy the source for packaging the U-Boot (omap3_beagle) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_omap3_beagle/" - cd "${srcdir}/grub-uboot_omap3_beagle/" - - echo 'Patch to detect omap3_beagle device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch" - - echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true - - echo 'Install /etc/default/grub (used by grub-mkconfig)...' - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" + _package_grub-uboot-dev "${pkgname#grub-}" 'BeagleBoard' } package_grub-omap3_beagle_xm() { - pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM (omap3_beagle_xm), (Parabola rebranded)' provides+=('grub-beagleboard') - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - - echo "Copy the source for packaging the U-Boot (omap3_beagle_xm) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_omap3_beagle_xm/" - cd "${srcdir}/grub-uboot_omap3_beagle_xm/" - - echo 'Patch to detect omap3_beagle_xm device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch" - - echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true - - echo 'Install /etc/default/grub (used by grub-mkconfig)...' - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" + _package_grub-uboot-dev "${pkgname#grub-}" 'BeagleBoard-xM' } package_grub-omap3_beagle_xm_ab() { - pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM rev A/B (omap3_beagle_xm_ab), (Parabola rebranded)' provides+=('grub-beagleboard') - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - - echo "Copy the source for packaging the U-Boot (omap3_beagle_xm_ab) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_omap3_beagle_xm_ab/" - cd "${srcdir}/grub-uboot_omap3_beagle_xm_ab/" - - echo 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch" - - echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true - - echo 'Install /etc/default/grub (used by grub-mkconfig)...' - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" + _package_grub-uboot-dev "${pkgname#grub-}" 'BeagleBoard-xM rev A/B' } package_grub-udoo() { - pkgdesc='GNU GRand Unified Bootloader (2) for UDOO (udoo), (Parabola rebranded)' - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - - echo "Copy the source for packaging the U-Boot (udoo) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_udoo/" - cd "${srcdir}/grub-uboot_udoo/" - - echo 'Patch to detect udoo device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch" - - echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true - - echo 'Install /etc/default/grub (used by grub-mkconfig)...' - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" + _package_grub-uboot-dev "${pkgname#grub-}" 'UDOO' } From cddec269f4bbda6d231cb8987c475403a2a36120 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:17:33 +0000 Subject: [PATCH 30/73] libre/grub: factor out the common part of the _build_grub-* functions --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 2f408e0..7eb37bb 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -212,62 +212,54 @@ prepare() { gzip -cd "${srcdir}/unifont-${_unifont_ver}.bdf.gz" > "unifont.bdf" } -_build_grub-efi() { - echo "Copy the source for building the ${_EFI_ARCH} EFI part..." - cp -r "${srcdir}/grub/" "${srcdir}/grub-efi-${_EFI_ARCH}/" - cd "${srcdir}/grub-efi-${_EFI_ARCH}/" - - echo "Unset all compiler FLAGS for ${_EFI_ARCH} EFI build..." +# Usage: _build_grub DIRSUFFIX 'Human Description' CPU-PLATFORM CONFIG_OPTIONS... +_build_grub() { + local bld_name="$1" + local bld_desc="$2" + local bld_cpu="${3%-*}" + local bld_plat="${3#*-}" + local bld_configure_options=("${@:4}") + + echo "Copy the source for building the ${bld_desc} part..." + cp -r "${srcdir}/grub/" "${srcdir}/grub-${bld_name}/" + cd "${srcdir}/grub-${bld_name}/" + + echo "Unset all compiler FLAGS for ${bld_desc} build..." unset CFLAGS unset CPPFLAGS unset CXXFLAGS unset LDFLAGS unset MAKEFLAGS - echo "Run bootstrap for ${_EFI_ARCH} EFI build..." + echo "Run bootstrap for ${bld_desc} build..." ./bootstrap \ --gnulib-srcdir="${srcdir}/gnulib/" \ --no-git - echo "Run ./configure for ${_EFI_ARCH} EFI build..." + echo "Run ./configure for ${bld_desc} build..." ./configure \ - --with-platform="efi" \ - --target="${_EFI_ARCH}" \ + --with-platform="${bld_plat}" \ + --target="${bld_cpu}" \ + "${bld_configure_options[@]}" + + echo "Run make for ${bld_desc} build..." + make +} + +_build_grub-efi() { + _build_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ + "${_EFI_ARCH}-efi" \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo "Run make for ${_EFI_ARCH} EFI build..." - make } _build_grub-xen() { - echo "Copy the source for building the ${_XEN_ARCH} XEN part..." - cp -r "${srcdir}/grub/" "${srcdir}/grub-xen-${_XEN_ARCH}/" - cd "${srcdir}/grub-xen-${_XEN_ARCH}/" - - echo "Unset all compiler FLAGS for ${_XEN_ARCH} XEN build..." - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo "Run bootstrap for ${_XEN_ARCH} XEN build..." - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo "Run ./configure for ${_XEN_ARCH} XEN build..." - ./configure \ - --with-platform='xen' \ - --target="${_XEN_ARCH}" \ + _build_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ + "${_XEN_ARCH}-xen" \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo "Run make for ${_XEN_ARCH} XEN build..." - make } _build_grub-bios() { @@ -278,212 +270,62 @@ _build_grub-bios() { _EFIEMU='--disable-efiemu' fi - echo 'Copy the source for building the BIOS part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-bios/" - cd "${srcdir}/grub-bios/" - - echo 'Unset all compiler FLAGS for BIOS build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for BIOS build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for BIOS build...' - ./configure \ - --with-platform='pc' \ - --target='i386' \ + _build_grub 'bios' 'BIOS' \ + 'i386-pc' \ "${_EFIEMU}" \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for BIOS build...' - make } _build_grub-qemu() { - echo 'Copy the source for building the QEMU part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-qemu/" - cd "${srcdir}/grub-qemu/" - - echo 'Unset all compiler FLAGS for QEMU build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for QEMU build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for QEMU build...' - ./configure \ + _build_grub 'qemu' 'QEMU' \ + 'i386-qemu' \ BUILD_FREETYPE="pkg-config freetype2" \ - --with-platform='qemu' \ - --target='i386' \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for QEMU build...' - make } _build_grub-ieee1275() { - echo 'Copy the source for building the IEEE1275 (OpenFirmware) part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-ieee1275/" - cd "${srcdir}/grub-ieee1275/" - - echo 'Unset all compiler FLAGS for IEEE1275 (OpenFirmware) build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for IEEE1275 (OpenFirmware) build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for IEEE1275 (OpenFirmware) build...' - ./configure \ - --with-platform='ieee1275' \ - --target='i386' \ + _build_grub 'ieee1275' 'IEEE1275 (OpenFirmware)' \ + 'i386-ieee1275' \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for IEEE1275 (OpenFirmware) build...' - make } _build_grub-libreboot() { - echo 'Copy the source for building the Libreboot part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-libreboot/" - cd "${srcdir}/grub-libreboot/" - - echo 'Unset all compiler FLAGS for Libreboot build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for Libreboot build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for Libreboot build...' - ./configure \ + _build_grub 'libreboot' 'Libreboot' \ + 'i386-coreboot' \ BUILD_FREETYPE="pkg-config freetype2" \ - --with-platform='coreboot' \ - --target='i386' \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for Libreboot build...' - make } _build_grub-multiboot() { - echo 'Copy the source for building the Multiboot part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-multiboot/" - cd "${srcdir}/grub-multiboot/" - - echo 'Unset all compiler FLAGS for Multiboot build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for Multiboot build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for Multiboot build...' - ./configure \ - --with-platform='multiboot' \ - --target='i386' \ + _build_grub 'multiboot' 'Multiboot' \ + 'i386-multiboot' \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for Multiboot build...' - make } _build_grub-emu() { - echo 'Copy the source for building the emu part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-emu/" - cd "${srcdir}/grub-emu/" - - echo 'Unset all compiler FLAGS for emu build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for emu build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for emu build...' - ./configure \ - --with-platform='emu' \ - --target="${_EMU_ARCH}" \ + _build_grub 'emu' 'emu' \ + "${_EMU_ARCH}-emu" \ --enable-grub-emu-usb=no \ --enable-grub-emu-sdl=no \ --disable-grub-emu-pci \ "${_configure_options[@]}" - - echo 'Run make for emu build...' - make } _build_grub-uboot() { - echo "Copy the source for building the U-Boot part..." - cp -r "${srcdir}/grub/" "${srcdir}/grub-uboot/" - cd "${srcdir}/grub-uboot/" - - echo 'Unset all compiler FLAGS for U-Boot build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - #sed -i '\|grub_arm_disable_caches_mmu|,+4 d - # ' grub-core/loader/arm/linux.c - - echo 'Run bootstrap for U-Boot build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for U-Boot build...' - ./configure \ - --with-platform='uboot' \ - --target='arm' \ + _build_grub 'uboot' 'U-Boot' \ + 'arm-uboot' \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for U-Boot build...' - make } build() { From 4535064c1064a998f972e89291f99dd8fcb0a8f4 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:05 +0000 Subject: [PATCH 31/73] libre/grub: factor out the common part of the _package_grub-* functions --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 7eb37bb..5321f78 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -377,112 +377,66 @@ build() { fi } -_package_grub-efi() { - cd "${srcdir}/grub-efi-${_EFI_ARCH}/" +# Usage: _package_grub DIRSUFFIX 'Human Description' CPU-PLATFORM +_package_grub() { + local bld_name="$1" + local bld_desc="$2" + local bld_cpuplat="$3" + + cd "${srcdir}/grub-${bld_name}/" - echo "Run make install for ${_EFI_ARCH} EFI build..." + echo "Run make install for ${bld_desc} build..." make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - echo "Remove gdb debugging related files for ${_EFI_ARCH} EFI build..." - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true + echo "Remove gdb debugging related files for ${bld_desc} build..." + rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/{kernel.exec,gdb_grub,gmodule.pl} || true } -_package_grub-xen() { - cd "${srcdir}/grub-xen-${_XEN_ARCH}/" - - echo "Run make install for ${_XEN_ARCH} XEN build..." - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install +_package_grub-efi() { + _package_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ + "${_EFI_ARCH}-efi" +} - echo "Remove gdb debugging related files for ${_XEN_ARCH} XEN build..." - rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/{kernel.exec,gdb_grub,gmodule.pl} || true +_package_grub-xen() { + _package_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ + "${_XEN_ARCH}-xen" } _package_grub-bios() { - cd "${srcdir}/grub-bios/" - - echo 'Run make install for BIOS build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for BIOS build...' - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'bios' 'BIOS' \ + 'i386-pc' } _package_grub-qemu() { - cd "${srcdir}/grub-qemu/" - - echo 'Run make install for QEMU build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for QEMU build...' - rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'qemu' 'QEMU' \ + 'i386-qemu' } _package_grub-ieee1275() { - cd "${srcdir}/grub-ieee1275/" - - echo 'Run make install for IEEE1275 (OpenFirmware) build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for IEEE1275 (OpenFirmware) build...' - rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'ieee1275' 'IEEE1275 (OpenFirmware)' \ + 'i386-ieee1275' } _package_grub-libreboot() { - cd "${srcdir}/grub-libreboot/" - - echo 'Run make install for Libreboot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for Libreboot build...' - rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'libreboot' 'Libreboot' \ + 'i386-coreboot' } _package_grub-multiboot() { - cd "${srcdir}/grub-multiboot/" - - echo 'Run make install for Multiboot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for Multiboot build...' - rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'multiboot' 'Multiboot' \ + 'i386-multiboot' } _package_grub-emu() { - cd "${srcdir}/grub-emu/" - - echo 'Run make install for emu build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for emu build...' - rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'emu' 'emu' \ + "${_EMU_ARCH}-emu" } _package_grub-uboot() { - cd "${srcdir}/grub-uboot/" - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'uboot' 'U-Boot' \ + 'arm-uboot' } package_grub() { @@ -565,15 +519,7 @@ _package_grub-uboot-dev() { patch -Np1 -i "${srcdir}/1000-${pkgname#grub-}--10_linux-20_linux_xen-detect-devicetree-file.patch" echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub "uboot_$devname" "$devdesc" 'arm' 'uboot' echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" From 65aece7497603eee1a7ea43b5ee8524ce8e95406 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:27 +0000 Subject: [PATCH 32/73] libre/grub: clean up build() and package() --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 5321f78..e8ac2a2 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -220,6 +220,8 @@ _build_grub() { local bld_plat="${3#*-}" local bld_configure_options=("${@:4}") + echo "Build grub ${bld_desc} stuff..." + echo "Copy the source for building the ${bld_desc} part..." cp -r "${srcdir}/grub/" "${srcdir}/grub-${bld_name}/" cd "${srcdir}/grub-${bld_name}/" @@ -264,6 +266,7 @@ _build_grub-xen() { _build_grub-bios() { echo 'Set ARCH dependent variables for BIOS build...' + local _EFIEMU if [[ "${CARCH}" = 'x86_64' ]]; then _EFIEMU='--enable-efiemu' else @@ -331,50 +334,37 @@ _build_grub-uboot() { build() { cd "${srcdir}/grub/" - if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then - echo "Build grub ${_EFI_ARCH} EFI stuff..." - _build_grub-efi + # All-CPU platforms #################################################### - if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then - echo 'Build grub i386 EFI stuff...' - _EFI_ARCH='i386' _build_grub-efi - fi + _build_grub-efi + if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then + _EFI_ARCH='i386' _build_grub-efi fi - if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then - if [[ "${_XEN}" = '1' ]]; then - echo "Build grub ${_XEN_ARCH} XEN stuff..." - _build_grub-xen + if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then + _build_grub-emu + fi - if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then - echo 'Build grub i386 XEN stuff...' - _XEN_ARCH='i386' _build_grub-xen - fi - fi + # CPU-specific platforms ############################################### - echo 'Build grub BIOS stuff...' + case "$CARCH" in + x86_64|i686) _build_grub-bios - - echo 'Build grub QEMU stuff...' _build_grub-qemu - - echo 'Build grub IEEE1275 (OpenFirmware) stuff...' _build_grub-ieee1275 - - echo 'Build grub Libreboot stuff...' _build_grub-libreboot - - echo 'Build grub Multiboot stuff...' _build_grub-multiboot - elif [[ "${CARCH}" = 'armv7h' ]]; then - echo 'Build grub U-Boot stuff...' + if [[ "${_XEN}" = '1' ]]; then + _build_grub-xen + if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then + _XEN_ARCH='i386' _build_grub-xen + fi + fi + ;; + armv7h) _build_grub-uboot - fi - - if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then - echo 'Build grub emu stuff...' - _build_grub-emu - fi + ;; + esac } # Usage: _package_grub DIRSUFFIX 'Human Description' CPU-PLATFORM @@ -383,6 +373,8 @@ _package_grub() { local bld_desc="$2" local bld_cpuplat="$3" + echo "Package grub ${bld_desc} stuff..." + cd "${srcdir}/grub-${bld_name}/" echo "Run make install for ${bld_desc} build..." @@ -453,50 +445,39 @@ package_grub() { cd "${srcdir}/grub/" - if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then - echo "Package grub ${_EFI_ARCH} EFI stuff..." - _package_grub-efi + # All-CPU platforms #################################################### - if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then - echo 'Package grub i386 EFI stuff...' - _EFI_ARCH='i386' _package_grub-efi - fi + _package_grub-efi + if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then + _EFI_ARCH='i386' _package_grub-efi fi - if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then - if [[ "${_XEN}" = '1' ]]; then - echo "Package grub ${_XEN_ARCH} XEN stuff..." - _package_grub-xen + if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then + _package_grub-emu + fi - if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then - echo 'Package grub i386 XEN stuff...' - _XEN_ARCH='i386' _package_grub-xen - fi - fi + # CPU-specific platforms ############################################### - echo 'Package grub BIOS stuff...' + case "$CARCH" in + x86_64|i686) _package_grub-bios - - echo 'Package grub QEMU stuff...' _package_grub-qemu - - echo 'Package grub IEEE1275 (OpenFirmware) stuff...' _package_grub-ieee1275 - - echo 'Package grub Libreboot stuff...' _package_grub-libreboot - - echo 'Package grub Multiboot stuff...' _package_grub-multiboot - elif [[ "${CARCH}" = 'armv7h' ]]; then - echo 'Package grub U-Boot stuff...' + if [[ "${_XEN}" = '1' ]]; then + _package_grub-xen + if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then + _XEN_ARCH='i386' _package_grub-xen + fi + fi + ;; + armv7h) _package_grub-uboot - fi + ;; + esac - if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then - echo 'Package grub emu stuff...' - _package_grub-emu - fi + # Common ############################################################### echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" @@ -518,7 +499,6 @@ _package_grub-uboot-dev() { echo "Patch to detect $devname device tree blob file (dtb)..." patch -Np1 -i "${srcdir}/1000-${pkgname#grub-}--10_linux-20_linux_xen-detect-devicetree-file.patch" - echo 'Package grub U-Boot stuff...' _package_grub "uboot_$devname" "$devdesc" 'arm' 'uboot' echo 'Install /etc/default/grub (used by grub-mkconfig)...' From 95b197eb948f67a88a0a3bd6d91037d56aa39eec Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 33/73] libre/grub: move the _{build,package}_grub-{bios,efi,emu} functions up/down To match the order in the Arch PKGBUILD --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index e8ac2a2..dbbf00f 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -248,22 +248,6 @@ _build_grub() { make } -_build_grub-efi() { - _build_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ - "${_EFI_ARCH}-efi" \ - --disable-efiemu \ - --enable-boot-time \ - "${_configure_options[@]}" -} - -_build_grub-xen() { - _build_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ - "${_XEN_ARCH}-xen" \ - --disable-efiemu \ - --enable-boot-time \ - "${_configure_options[@]}" -} - _build_grub-bios() { echo 'Set ARCH dependent variables for BIOS build...' local _EFIEMU @@ -280,6 +264,31 @@ _build_grub-bios() { "${_configure_options[@]}" } +_build_grub-efi() { + _build_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ + "${_EFI_ARCH}-efi" \ + --disable-efiemu \ + --enable-boot-time \ + "${_configure_options[@]}" +} + +_build_grub-emu() { + _build_grub 'emu' 'emu' \ + "${_EMU_ARCH}-emu" \ + --enable-grub-emu-usb=no \ + --enable-grub-emu-sdl=no \ + --disable-grub-emu-pci \ + "${_configure_options[@]}" +} + +_build_grub-xen() { + _build_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ + "${_XEN_ARCH}-xen" \ + --disable-efiemu \ + --enable-boot-time \ + "${_configure_options[@]}" +} + _build_grub-qemu() { _build_grub 'qemu' 'QEMU' \ 'i386-qemu' \ @@ -314,15 +323,6 @@ _build_grub-multiboot() { "${_configure_options[@]}" } -_build_grub-emu() { - _build_grub 'emu' 'emu' \ - "${_EMU_ARCH}-emu" \ - --enable-grub-emu-usb=no \ - --enable-grub-emu-sdl=no \ - --disable-grub-emu-pci \ - "${_configure_options[@]}" -} - _build_grub-uboot() { _build_grub 'uboot' 'U-Boot' \ 'arm-uboot' \ @@ -386,21 +386,26 @@ _package_grub() { rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/{kernel.exec,gdb_grub,gmodule.pl} || true } +_package_grub-bios() { + _package_grub 'bios' 'BIOS' \ + 'i386-pc' +} + _package_grub-efi() { _package_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ "${_EFI_ARCH}-efi" } +_package_grub-emu() { + _package_grub 'emu' 'emu' \ + "${_EMU_ARCH}-emu" +} + _package_grub-xen() { _package_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ "${_XEN_ARCH}-xen" } -_package_grub-bios() { - _package_grub 'bios' 'BIOS' \ - 'i386-pc' -} - _package_grub-qemu() { _package_grub 'qemu' 'QEMU' \ 'i386-qemu' @@ -421,11 +426,6 @@ _package_grub-multiboot() { 'i386-multiboot' } -_package_grub-emu() { - _package_grub 'emu' 'emu' \ - "${_EMU_ARCH}-emu" -} - _package_grub-uboot() { _package_grub 'uboot' 'U-Boot' \ 'arm-uboot' From ea6e1e629e559c7bbda8821be1bcae5b9c2fb528 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 34/73] libre/grub: run ./bootstrap in prepare() instead of build() --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index dbbf00f..9e1017f 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -210,6 +210,11 @@ prepare() { echo "Avoid problem with unifont during compile of grub..." # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847 gzip -cd "${srcdir}/unifont-${_unifont_ver}.bdf.gz" > "unifont.bdf" + + echo "Run bootstrap..." + ./bootstrap \ + --gnulib-srcdir="${srcdir}/gnulib/" \ + --no-git } # Usage: _build_grub DIRSUFFIX 'Human Description' CPU-PLATFORM CONFIG_OPTIONS... @@ -233,11 +238,6 @@ _build_grub() { unset LDFLAGS unset MAKEFLAGS - echo "Run bootstrap for ${bld_desc} build..." - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - echo "Run ./configure for ${bld_desc} build..." ./configure \ --with-platform="${bld_plat}" \ From cb1d5858e9e653ae933d484daefb30be56312513 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 35/73] libre/grub: s/fuse/fuse2/ --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 9e1017f..e3621e5 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -98,10 +98,10 @@ install="${pkgname}.install" options=('!makeflags') makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' - 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' - 'fuse: For grub-mount usage') + 'fuse2: For grub-mount usage') if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; then makedepends+=('xen') From 5b7c4eb3e0abde7a005ec66ee062f2c08cbfb1e9 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 36/73] libre/grub: always pass BUILD_FREETYPE= --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index e3621e5..ed6833f 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -158,6 +158,7 @@ _backports=( _configure_options=( FREETYPE="pkg-config freetype2" + BUILD_FREETYPE="pkg-config freetype2" --enable-mm-debug --enable-nls --enable-device-mapper @@ -292,7 +293,6 @@ _build_grub-xen() { _build_grub-qemu() { _build_grub 'qemu' 'QEMU' \ 'i386-qemu' \ - BUILD_FREETYPE="pkg-config freetype2" \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" @@ -309,7 +309,6 @@ _build_grub-ieee1275() { _build_grub-libreboot() { _build_grub 'libreboot' 'Libreboot' \ 'i386-coreboot' \ - BUILD_FREETYPE="pkg-config freetype2" \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" From 14a544b18cf971ec8a116caaf4da0de2d8c4b127 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 37/73] libre/grub: clean up optdepends --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index ed6833f..db7b341 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -101,7 +101,12 @@ makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' - 'fuse2: For grub-mount usage') + 'fuse2: For grub-mount usage' + #'dosfstools: For grub-mkrescue FAT FS and EFI support' # drop 'and EFI' from the device-specific arm-uboot packages + #'efibootmgr: For grub-install EFI support' # drop from the device-specific arm-uboot packages + #'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' # drop from the device-specific arm-uboot packages + 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' + 'mtools: For grub-mkrescue FAT FS support') if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; then makedepends+=('xen') @@ -109,6 +114,8 @@ fi if [[ "${_GRUB_EMU_BUILD}" = "1" ]]; then makedepends+=('libusbx' 'sdl') + #optdepends+=('libusbx: For grub-emu USB support' # drop from the device-specific arm-uboot packages + # 'sdl: For grub-emu SDL support') # drop from the device-specific arm-uboot packages fi if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then @@ -433,9 +440,7 @@ _package_grub-uboot() { package_grub() { optdepends+=('dosfstools: For grub-mkrescue FAT FS and EFI support' 'efibootmgr: For grub-install EFI support' - 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') + 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue') if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then optdepends+=('libusbx: For grub-emu USB support' @@ -487,9 +492,7 @@ _package_grub-uboot-dev() { local devdesc=$2 pkgdesc="GNU GRand Unified Bootloader (2) for $devdesc ($devname), (Parabola rebranded)" - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') + optdepends+=('dosfstools: For grub-mkrescue FAT FS') echo "Copy the source for packaging the U-Boot ($devname) part..." cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_$devname/" From 620ba961e77afd0aab2c11db336334b588e84089 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 38/73] libre/grub: pull reproducible-build bits from Arch --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index db7b341..7a73b6e 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -223,6 +223,9 @@ prepare() { ./bootstrap \ --gnulib-srcdir="${srcdir}/gnulib/" \ --no-git + + echo "Make translations reproducible..." + sed -i '1i /^PO-Revision-Date:/ d' po/*.sed } # Usage: _build_grub DIRSUFFIX 'Human Description' CPU-PLATFORM CONFIG_OPTIONS... @@ -252,6 +255,9 @@ _build_grub() { --target="${bld_cpu}" \ "${bld_configure_options[@]}" + echo "Make info pages reproducible..." + touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi') + echo "Run make for ${bld_desc} build..." make } From a7ed3ea1f0f873ef80b4ef7d3548e3b5f984649d Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 39/73] libre/grub: reduce formatting differences with upstream This is formatting/comment/message/... changes only; no functional changes. --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 7a73b6e..93bdf0d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -52,34 +52,42 @@ # * --with-platform=qemu (a separate -kernel file for Qemu, x86-only) # * --with-platform=multiboot (x86-only) -## '1' to enable Xen support, '0' to disable -_XEN='0' +## "1" to enable Xen support, "0" to disable +_XEN="0" -## '1' to enable IA32-EFI build in Arch x86_64, '0' to disable -_IA32_EFI_IN_ARCH_X64='1' +## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable +_IA32_EFI_IN_ARCH_X64="1" -## '1' to enable IA32-XEN build in Arch x86_64, "0" to disable -_IA32_XEN_IN_ARCH_X64='1' +## "1" to enable IA32-XEN build in Arch x86_64, "0" to disable +_IA32_XEN_IN_ARCH_X64="1" -## '1' to enable EMU build, "0" to disable -_GRUB_EMU_BUILD='0' +## "1" to enable EMU build, "0" to disable +_GRUB_EMU_BUILD="0" -[[ "${CARCH}" = 'armv7h' ]] && _EFI_ARCH='arm' -[[ "${CARCH}" = 'x86_64' ]] && _EFI_ARCH='x86_64' -[[ "${CARCH}" = 'i686' ]] && _EFI_ARCH='i386' +[[ "${CARCH}" == 'armv7h' ]] && _EFI_ARCH='arm' +[[ "${CARCH}" == 'x86_64' ]] && _EFI_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _EFI_ARCH='i386' -[[ "${CARCH}" = 'x86_64' ]] && _XEN_ARCH='x86_64' -[[ "${CARCH}" = 'i686' ]] && _XEN_ARCH='i386' +[[ "${CARCH}" == 'x86_64' ]] && _XEN_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _XEN_ARCH='i386' -[[ "${CARCH}" = 'armv7h' ]] && _EMU_ARCH='arm' -[[ "${CARCH}" = 'x86_64' ]] && _EMU_ARCH='x86_64' -[[ "${CARCH}" = 'i686' ]] && _EMU_ARCH='i386' +[[ "${CARCH}" == 'armv7h' ]] && _EMU_ARCH='arm' +[[ "${CARCH}" == 'x86_64' ]] && _EMU_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _EMU_ARCH='i386' pkgbase='grub' pkgname=('grub') -[[ $CARCH = armv7h ]] && pkgname+=('grub-am335x_bone' 'grub-udoo' 'grub-omap3_beagle' - 'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab') -pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)' +if [[ $CARCH == armv7h ]]; then + pkgname+=( + 'grub-am335x_bone' + 'grub-udoo' + 'grub-omap3_beagle' + 'grub-omap3_beagle_xm' + 'grub-omap3_beagle_xm_ab' + ) +fi +pkgdesc='GNU GRand Unified Bootloader (2)' +pkgdesc+=', (Parabola rebranded)' epoch=2 _tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver} _gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3' @@ -90,13 +98,25 @@ pkgrel=1 pkgrel+=.parabola1 url='https://www.gnu.org/software/grub/' arch=('x86_64') -arch+=('i686' 'armv7h') +arch+=('i686') +arch+=('armv7h') license=('GPL3') backup=('etc/default/grub' 'etc/grub.d/40_custom') install="${pkgname}.install" options=('!makeflags') +conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy') +conflicts+=('grub-parabola') +replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") +replaces+=('grub-parabola') +provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") +if [[ "${CARCH}" = 'armv7h' ]]; then + conflicts=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") + replaces=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") + provides=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") +fi + makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2') depends=('sh' 'xz' 'gettext' 'device-mapper') @@ -112,25 +132,15 @@ if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; then makedepends+=('xen') fi -if [[ "${_GRUB_EMU_BUILD}" = "1" ]]; then - makedepends+=('libusbx' 'sdl') - #optdepends+=('libusbx: For grub-emu USB support' # drop from the device-specific arm-uboot packages - # 'sdl: For grub-emu SDL support') # drop from the device-specific arm-uboot packages -fi - -if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then - provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") - conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy' 'grub-parabola') - replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-parabola') -elif [[ "${CARCH}" = 'armv7h' ]]; then - provides=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") - conflicts=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") - replaces=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") +if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + makedepends+=('libusbx' 'sdl') + #optdepends+=('libusbx: For grub-emu USB support' # drop from the device-specific arm-uboot packages + # 'sdl: For grub-emu SDL support') # drop from the device-specific arm-uboot packages fi validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko 'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper - '95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy + '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed" "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}" @@ -198,7 +208,7 @@ prepare() { echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..." ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html - patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" + patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" echo "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig..." patch -Np1 -i "${srcdir}/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch" @@ -216,7 +226,7 @@ prepare() { ./linguas.sh echo "Avoid problem with unifont during compile of grub..." - # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847 + # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847 gzip -cd "${srcdir}/unifont-${_unifont_ver}.bdf.gz" > "unifont.bdf" echo "Run bootstrap..." @@ -263,15 +273,15 @@ _build_grub() { } _build_grub-bios() { - echo 'Set ARCH dependent variables for BIOS build...' + echo "Set ARCH dependent variables for bios build..." local _EFIEMU - if [[ "${CARCH}" = 'x86_64' ]]; then - _EFIEMU='--enable-efiemu' + if [[ "${CARCH}" == 'x86_64' ]]; then + _EFIEMU="--enable-efiemu" else - _EFIEMU='--disable-efiemu' + _EFIEMU="--disable-efiemu" fi - _build_grub 'bios' 'BIOS' \ + _build_grub 'bios' 'bios' \ 'i386-pc' \ "${_EFIEMU}" \ --enable-boot-time \ @@ -279,7 +289,7 @@ _build_grub-bios() { } _build_grub-efi() { - _build_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ + _build_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} efi" \ "${_EFI_ARCH}-efi" \ --disable-efiemu \ --enable-boot-time \ @@ -349,11 +359,11 @@ build() { # All-CPU platforms #################################################### _build_grub-efi - if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then - _EFI_ARCH='i386' _build_grub-efi + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + _EFI_ARCH="i386" _build_grub-efi fi - if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then _build_grub-emu fi @@ -399,12 +409,12 @@ _package_grub() { } _package_grub-bios() { - _package_grub 'bios' 'BIOS' \ + _package_grub 'bios' 'bios' \ 'i386-pc' } _package_grub-efi() { - _package_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ + _package_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} efi" \ "${_EFI_ARCH}-efi" } @@ -458,11 +468,11 @@ package_grub() { # All-CPU platforms #################################################### _package_grub-efi - if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then - _EFI_ARCH='i386' _package_grub-efi + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + _EFI_ARCH="i386" _package_grub-efi fi - if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then _package_grub-emu fi @@ -489,7 +499,7 @@ package_grub() { # Common ############################################################### - echo 'Install /etc/default/grub (used by grub-mkconfig)...' + echo "Install /etc/default/grub (used by grub-mkconfig)..." install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" } From 9d06ef07c8b978ba786b1b9d384d541da027db0c Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 40/73] libre/grub: adopt the package --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 93bdf0d..829cd73 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -4,7 +4,8 @@ # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Contributor: André Silva # Contributor: Márcio Silva -# Maintainer: Omar Vega Ramos +# Contributor: Omar Vega Ramos +# Maintainer: Luke T. Shumaker # Differences from Arch's `core/grub`: # From e0965ffc0a1decc8f779a0a9f3ddf3edc0bcdd95 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 41/73] libre/grub: don't run linguas.sh --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 829cd73..80c157c 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -223,8 +223,15 @@ prepare() { echo "Fix mkinitcpio 'rw' FS#36275..." sed 's| ro | rw |g' -i "util/grub.d/10_linux.in" - echo "Pull in latest language files..." - ./linguas.sh + # linguas.sh rsync's from translationproject.org; this will + # fail with libremakepkg because networking is turned off. + # And we can't "optimistically" run it, because it doesn't do + # error-handling and will delete files that we need. If + # pulling in updated translations is important, then it needs + # to be done prior to prepare(). + # + #echo "Pull in latest language files..." + #./linguas.sh echo "Avoid problem with unifont during compile of grub..." # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847 From 5c28d38870946497c150c43b51f9ddf89a957928 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 03:18:29 +0000 Subject: [PATCH 42/73] libre/grub: bump pkgrel --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 80c157c..8bf814d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -96,7 +96,7 @@ _unifont_ver='13.0.06' _pkgver=2.06 pkgver=${_pkgver/-/} pkgrel=1 -pkgrel+=.parabola1 +pkgrel+=.parabola2 url='https://www.gnu.org/software/grub/' arch=('x86_64') arch+=('i686') From 05b3af66f5ec75521ae3b88e0824fe944f241163 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 08 2024 03:42:52 +0000 Subject: [PATCH 43/73] [qt5-webkit][pyqt5][qutebrowser][qt5-styleplugins]: rebuild against latest 'qt5-base' --- diff --git a/libre/pyqt5/PKGBUILD b/libre/pyqt5/PKGBUILD index f5a99e9..c9c18ee 100644 --- a/libre/pyqt5/PKGBUILD +++ b/libre/pyqt5/PKGBUILD @@ -20,7 +20,7 @@ pkgname=('python-pyqt5') pkgdesc="A set of Python bindings for the Qt5 toolkit" pkgver=5.15.10 pkgrel=1 -pkgrel+=.parabola1 +pkgrel+=.parabola2 arch=('x86_64') arch+=('armv7h' 'i686') url="https://riverbankcomputing.com/software/pyqt/intro" diff --git a/libre/qt5-styleplugins/PKGBUILD b/libre/qt5-styleplugins/PKGBUILD index a3f5d57..8e6203c 100644 --- a/libre/qt5-styleplugins/PKGBUILD +++ b/libre/qt5-styleplugins/PKGBUILD @@ -13,7 +13,7 @@ pkgver=5.0.0.20170311 # $_commit is the unreleased VCS tip from 2017 (the de-facto final release) _commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3 pkgdesc='Additional style plugins for Qt5' -pkgrel=44 +pkgrel=45 arch=('x86_64' 'aarch64') arch+=('armv7h' 'i686') url="https://github.com/qt/qtstyleplugins" diff --git a/libre/qt5-webkit/PKGBUILD b/libre/qt5-webkit/PKGBUILD index 4a7308e..ba5b201 100644 --- a/libre/qt5-webkit/PKGBUILD +++ b/libre/qt5-webkit/PKGBUILD @@ -18,7 +18,7 @@ pkgname=qt5-webkit _pkgver=5.212.0-alpha4 pkgver=${_pkgver/-/} pkgrel=21 -pkgrel+=.parabola1 +pkgrel+=.parabola2 arch=(x86_64) arch+=(armv7h i686) url='https://github.com/qtwebkit/qtwebkit' diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index 932a08b..e9e002d 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -21,7 +21,7 @@ pkgname=qutebrowser pkgver=2.5.4 pkgrel=2 -pkgrel+=.parabola6 +pkgrel+=.parabola7 pkgdesc="A keyboard-driven, vim-like browser based on PyQt5" pkgdesc+=" and QtWebKit" arch=("any") From b1dd1c7517288b138e8770f5a18dea752abe7039 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 15:46:45 +0000 Subject: [PATCH 44/73] Merge branch 'lukeshu/grub' --- diff --git a/libre/grub/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch b/libre/grub/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch new file mode 100644 index 0000000..3ae7d95 --- /dev/null +++ b/libre/grub/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch @@ -0,0 +1,138 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-17 13:39:03.509682976 -0500 +@@ -91,10 +91,14 @@ + fi + if [ x$type != xsimple ] ; then + case $type in ++ booster) ++ title="$(gettext_printf "%s, %s kernel (booster initramfs)" "${os}" "${version}")" ;; ++ fallback) ++ title="$(gettext_printf "%s, %s kernel (fallback initramfs)" "${os}" "${version}")" ;; + recovery) +- title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; ++ title="$(gettext_printf "%s, %s kernel (recovery mode)" "${os}" "${version}")" ;; + *) +- title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; ++ title="$(gettext_printf "%s, %s kernel" "${os}" "${version}")" ;; + esac + if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then + replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" +@@ -106,7 +110,7 @@ + else + echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi +- if [ x$type != xrecovery ] ; then ++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then + save_default_entry | grub_add_tab + fi + +@@ -138,7 +142,7 @@ + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + fi +- message="$(gettext_printf "Loading Linux %s ..." ${version})" ++ message="$(gettext_printf "Loading %s kernel ..." ${version})" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +@@ -198,7 +202,7 @@ + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` +- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` ++ version=`echo $basename | sed -e "s,vmlinuz-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + +@@ -285,6 +289,29 @@ + + linux_entry "${OS}" "${version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ ++ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then ++ initrd="${initrd_early} initramfs-${version}-fallback.img" ++ ++ if test -n "${initrd}" ; then ++ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 ++ fi ++ ++ linux_entry "${OS}" "${version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ ++ if test -e "${dirname}/booster-${version}.img" ; then ++ initrd="${initrd_early} booster-${version}.img" ++ ++ if test -n "${initrd}" ; then ++ gettext_printf "Found booster initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2 ++ fi ++ ++ linux_entry "${OS}" "${version}" booster \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-17 03:22:43.732079272 -0500 +@@ -117,9 +117,11 @@ + fi + if [ x$type != xsimple ] ; then + if [ x$type = xrecovery ] ; then +- title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel (recovery mode)" "${os}" "${xen_version}" "${version}")" ++ elif [ x$type = xfallback ] ; then ++ title="$(gettext_printf "%s, with Xen %s and %s kernel (fallback initramfs)" "${os}" "${xen_version}" "${version}")" + else +- title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel" "${os}" "${xen_version}" "${version}")" + fi + replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" + if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then +@@ -132,7 +134,7 @@ + title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" + echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi +- if [ x$type != xrecovery ] ; then ++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then + save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" + fi + +@@ -141,7 +143,7 @@ + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" +- lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" ++ lmessage="$(gettext_printf "Loading %s kernel ..." ${version})" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$xmessage" | grub_quote)' + if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then +@@ -275,7 +277,7 @@ + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` +- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` ++ version=`echo $basename | sed -e "s,vmlinuz-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + +@@ -341,6 +343,18 @@ + + linux_entry "${OS}" "${version}" "${xen_version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" ++ ++ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then ++ initrd="initramfs-${version}-fallback.img" ++ ++ if test -n "${initrd}" ; then ++ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 ++ fi ++ ++ linux_entry "${OS}" "${version}" "${xen_version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" "${xen_version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch deleted file mode 100644 index eac637d..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:16:38.219592837 -0500 -@@ -155,6 +155,25 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb -+EOF -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb -+EOF -+ fi -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +280,16 @@ - fi - fi - -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 -+ fi -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:23:54.679591971 -0500 -@@ -172,6 +172,25 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb -+EOF -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree file ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb -+EOF -+ fi -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +335,16 @@ - fi - fi - -+ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 -+ fi -+ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then -+ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then -+ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 -+ fi -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch deleted file mode 100644 index 71d04cb..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:35:47.579590557 -0500 -@@ -155,6 +155,14 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +269,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:38:28.569590238 -0500 -@@ -172,6 +172,14 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +324,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch deleted file mode 100644 index 3ba413c..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:45:30.129589402 -0500 -@@ -155,6 +155,14 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +269,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:46:39.199589265 -0500 -@@ -172,6 +172,14 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +324,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch deleted file mode 100644 index f24eed1..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:52:13.679588602 -0500 -@@ -155,6 +155,14 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +269,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:53:25.419588460 -0500 -@@ -172,6 +172,14 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +324,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch deleted file mode 100644 index 3ae7d95..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-17 13:39:03.509682976 -0500 -@@ -91,10 +91,14 @@ - fi - if [ x$type != xsimple ] ; then - case $type in -+ booster) -+ title="$(gettext_printf "%s, %s kernel (booster initramfs)" "${os}" "${version}")" ;; -+ fallback) -+ title="$(gettext_printf "%s, %s kernel (fallback initramfs)" "${os}" "${version}")" ;; - recovery) -- title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; -+ title="$(gettext_printf "%s, %s kernel (recovery mode)" "${os}" "${version}")" ;; - *) -- title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; -+ title="$(gettext_printf "%s, %s kernel" "${os}" "${version}")" ;; - esac - if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then - replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" -@@ -106,7 +110,7 @@ - else - echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - fi -- if [ x$type != xrecovery ] ; then -+ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then - save_default_entry | grub_add_tab - fi - -@@ -138,7 +142,7 @@ - fi - printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - fi -- message="$(gettext_printf "Loading Linux %s ..." ${version})" -+ message="$(gettext_printf "Loading %s kernel ..." ${version})" - sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$message" | grub_quote)' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -198,7 +202,7 @@ - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` -- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` -+ version=`echo $basename | sed -e "s,vmlinuz-,,g"` - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - -@@ -285,6 +289,29 @@ - - linux_entry "${OS}" "${version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ -+ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then -+ initrd="${initrd_early} initramfs-${version}-fallback.img" -+ -+ if test -n "${initrd}" ; then -+ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 -+ fi -+ -+ linux_entry "${OS}" "${version}" fallback \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ fi -+ -+ if test -e "${dirname}/booster-${version}.img" ; then -+ initrd="${initrd_early} booster-${version}.img" -+ -+ if test -n "${initrd}" ; then -+ gettext_printf "Found booster initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2 -+ fi -+ -+ linux_entry "${OS}" "${version}" booster \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -+ fi -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-17 03:22:43.732079272 -0500 -@@ -117,9 +117,11 @@ - fi - if [ x$type != xsimple ] ; then - if [ x$type = xrecovery ] ; then -- title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" -+ title="$(gettext_printf "%s, with Xen %s and %s kernel (recovery mode)" "${os}" "${xen_version}" "${version}")" -+ elif [ x$type = xfallback ] ; then -+ title="$(gettext_printf "%s, with Xen %s and %s kernel (fallback initramfs)" "${os}" "${xen_version}" "${version}")" - else -- title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" -+ title="$(gettext_printf "%s, with Xen %s and %s kernel" "${os}" "${xen_version}" "${version}")" - fi - replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" - if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then -@@ -132,7 +134,7 @@ - title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" - echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - fi -- if [ x$type != xrecovery ] ; then -+ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then - save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" - fi - -@@ -141,7 +143,7 @@ - fi - printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" -- lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" -+ lmessage="$(gettext_printf "Loading %s kernel ..." ${version})" - sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$xmessage" | grub_quote)' - if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then -@@ -275,7 +277,7 @@ - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` -- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` -+ version=`echo $basename | sed -e "s,vmlinuz-,,g"` - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - -@@ -341,6 +343,18 @@ - - linux_entry "${OS}" "${version}" "${xen_version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" -+ -+ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then -+ initrd="initramfs-${version}-fallback.img" -+ -+ if test -n "${initrd}" ; then -+ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2 -+ fi -+ -+ linux_entry "${OS}" "${version}" "${xen_version}" fallback \ -+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" -+ fi -+ - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" "${xen_version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch deleted file mode 100644 index 692ac51..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 -+++ b/util/grub.d/10_linux.in 2021-06-18 02:58:17.879587880 -0500 -@@ -155,6 +155,14 @@ - initrd $(echo $initrd_path) - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -261,6 +269,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:59:12.559587771 -0500 -@@ -172,6 +172,14 @@ - ${module_loader} ${rel_dirname}/${xenpolicy} - EOF - fi -+ if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then -+ # TRANSLATORS: Device tree path isn't identifier. Should be translated. -+ message="$(gettext_printf "Loading devices tree path ...")" -+ sed "s/^/$submenu_indentation/" << EOF -+ echo '$(echo "$message" | grub_quote)' -+ devicetree ${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb -+EOF -+ fi - sed "s/^/$submenu_indentation/" << EOF - } - EOF -@@ -316,6 +324,10 @@ - fi - fi - -+ if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then -+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2 -+ fi -+ - # The GRUB_DISABLE_SUBMENU option used to be different than others since it was - # mentioned in the documentation that has to be set to 'y' instead of 'true' to - # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/09_parabola b/libre/grub/09_parabola deleted file mode 100644 index 90a9062..0000000 --- a/libre/grub/09_parabola +++ /dev/null @@ -1,195 +0,0 @@ -#!/usr/bin/env bash - -## -## grub-mkconfig helper script specific to Parabola GNU/Linux-libre -## Contributed by "Keshav Amburay" -## Rebranded for Parabola by "André Silva" -## Updated on 08 February 2014 -## -## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script -## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream -## -## This script can be freely distributed and/or modified -## under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This script is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -_FUNC_GRUB_FILE_PRESENT() { - - [[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86" - - if [[ "${GRUB_PLATFORM}" == "x86" ]]; then - check="--is-x86-linux32" - elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then - check="--is-i386-xen-pae-domu" - elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then - check="--is-x86_64-xen-domu" - else - check="--is-${GRUB_PLATFORM}-linux" - fi - - case "${GRUB_PLATFORM}" in - x86) - list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do - if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi - done)" ;; - *) - list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do - if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi - done)" ;; - esac -} - -set -e - -prefix="/usr" -exec_prefix="${prefix}" -datarootdir="/usr/share" -datadir="${datarootdir}" -sysconfdir="/etc" - -. "${datarootdir}/grub/grub-mkconfig_lib" - -. "${sysconfdir}/default/grub" - -export TEXTDOMAIN="grub" -export TEXTDOMAINDIR="${datarootdir}/locale" - -CLASS="--class parabola --class gnu-linux --class gnu --class os" - -[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT - -BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)" -BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null || true)" -BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)" - -ROOT_PART_GRUB_DEVICE="$(${grub_probe} --target=device / || true)" -ROOT_PART_FS="$(${grub_probe} --device ${ROOT_PART_GRUB_DEVICE} --target=fs 2> /dev/null || echo "unknown")" - -if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then - - case "${ROOT_PART_FS}" in - btrfs) - rootsubvol="$(make_system_path_relative_to_its_root /)" - rootsubvol="${rootsubvol#/}" - if [[ "${rootsubvol}" != "" ]]; then - GRUB_LINUX_ROOT_DEVICE="subvol=${rootsubvol}" - fi - ;; - zfs) - rpool="$(${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true)" - bootfs="$(make_system_path_relative_to_its_root / | sed -e "s,@$,,")" - GRUB_LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" - ;; - esac - - if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \ - [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \ - [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \ - uses_abstraction "${GRUB_DEVICE}" lvm ; then - GRUB_LINUX_ROOT_DEVICE="${GRUB_DEVICE}" - else - GRUB_LINUX_ROOT_DEVICE="UUID=${GRUB_DEVICE_UUID}" - fi -fi - -[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - -for _KERNEL_ in ${list} ; do - - echo "Found linux image: ${_KERNEL_}" >&2 - - basename="$(basename "${_KERNEL_}")" - dirname="$(dirname "${_KERNEL_}")" - REAL_DIR="$(make_system_path_relative_to_its_root "${dirname}")" - - _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')" - _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')" - - _INITRAMFS_="${_KERNEL_FILE_/vmlinuz-/initramfs-}.img" - - if [[ -e "/boot/${_INITRAMFS_}" ]]; then - - echo "Found initramfs image: /boot/${_INITRAMFS_}" >&2 - -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel initramfs ...' - initrd ${REAL_DIR}/${_INITRAMFS_} -} - -EOF - fi - - _INITRAMFS_FALLBACK_="${_KERNEL_FILE_/vmlinuz-/initramfs-}-fallback.img" - - if [[ -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then - - echo "Found fallback initramfs image: /boot/${_INITRAMFS_FALLBACK_}" >&2 - -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel fallback initramfs ...' - initrd ${REAL_DIR}/${_INITRAMFS_FALLBACK_} -} - -EOF - fi - - if [[ ! -e "/boot/${_INITRAMFS_}" ]] && [[ ! -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then -cat << EOF - -menuentry "Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} { - $(save_default_entry) - if [ x\$feature_all_video_module = xy ]; then - insmod all_video - fi - set gfxpayload=keep - insmod ${BOOT_PART_FS} - if [ x\$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} - else - search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} - fi - echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' - linux ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} -} - -EOF - fi - -done diff --git a/libre/grub/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..eac637d --- /dev/null +++ b/libre/grub/1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,90 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:16:38.219592837 -0500 +@@ -155,6 +155,25 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then ++ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree file ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb ++EOF ++ fi ++ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then ++ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree file ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb ++EOF ++ fi ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +280,16 @@ + fi + fi + ++ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then ++ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then ++ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 ++ fi ++ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then ++ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then ++ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 ++ fi ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:23:54.679591971 -0500 +@@ -172,6 +172,25 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then ++ if test -f "${rel_dirname}/dtbs/${version}/am335x-bone.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree file ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/am335x-bone.dtb ++EOF ++ fi ++ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then ++ if test -f "${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree file ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/am335x-boneblack.dtb ++EOF ++ fi ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +335,16 @@ + fi + fi + ++ if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then ++ if test -f "${dirname}/dtbs/${version}/am335x-bone.dtb" ; then ++ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-bone.dtb" >&2 ++ fi ++ elif [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BNLT' ]; then ++ if test -f "${dirname}/dtbs/${version}/am335x-boneblack.dtb" ; then ++ gettext_printf "Found device tree file: %s\n" "${dirname}/dtbs/${version}/am335x-boneblack.dtb" >&2 ++ fi ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..71d04cb --- /dev/null +++ b/libre/grub/1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,56 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:35:47.579590557 -0500 +@@ -155,6 +155,14 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +269,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:38:28.569590238 -0500 +@@ -172,6 +172,14 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +324,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..3ba413c --- /dev/null +++ b/libre/grub/1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,56 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:45:30.129589402 -0500 +@@ -155,6 +155,14 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +269,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:46:39.199589265 -0500 +@@ -172,6 +172,14 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +324,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..f24eed1 --- /dev/null +++ b/libre/grub/1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,56 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:52:13.679588602 -0500 +@@ -155,6 +155,14 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +269,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:53:25.419588460 -0500 +@@ -172,6 +172,14 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +324,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch b/libre/grub/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch new file mode 100644 index 0000000..692ac51 --- /dev/null +++ b/libre/grub/1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch @@ -0,0 +1,56 @@ +--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500 ++++ b/util/grub.d/10_linux.in 2021-06-18 02:58:17.879587880 -0500 +@@ -155,6 +155,14 @@ + initrd $(echo $initrd_path) + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -261,6 +269,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', +--- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 ++++ b/util/grub.d/20_linux_xen.in 2021-06-18 02:59:12.559587771 -0500 +@@ -172,6 +172,14 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} + EOF + fi ++ if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then ++ # TRANSLATORS: Device tree path isn't identifier. Should be translated. ++ message="$(gettext_printf "Loading devices tree path ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ devicetree ${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb ++EOF ++ fi + sed "s/^/$submenu_indentation/" << EOF + } + EOF +@@ -316,6 +324,10 @@ + fi + fi + ++ if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then ++ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2 ++ fi ++ + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 1b031ac..8bf814d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -4,36 +4,91 @@ # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Contributor: André Silva # Contributor: Márcio Silva -# Maintainer: Omar Vega Ramos - -## '1' to enable Xen support, '0' to disable -_XEN='0' - -## '1' to enable IA32-EFI build in Arch x86_64, '0' to disable -_IA32_EFI_IN_ARCH_X64='1' - -## '1' to enable IA32-XEN build in Arch x86_64, "0" to disable -_IA32_XEN_IN_ARCH_X64='1' - -## '1' to enable EMU build (x86_64 and i686 only), "0" to disable -_GRUB_EMU_BUILD='0' - -[[ "${CARCH}" = 'armv7h' ]] && _EFI_ARCH='arm' -[[ "${CARCH}" = 'x86_64' ]] && _EFI_ARCH='x86_64' -[[ "${CARCH}" = 'i686' ]] && _EFI_ARCH='i386' - -[[ "${CARCH}" = 'x86_64' ]] && _XEN_ARCH='x86_64' -[[ "${CARCH}" = 'i686' ]] && _XEN_ARCH='i386' - -[[ "${CARCH}" = 'armv7h' ]] && _EMU_ARCH='arm' -[[ "${CARCH}" = 'x86_64' ]] && _EMU_ARCH='x86_64' -[[ "${CARCH}" = 'i686' ]] && _EMU_ARCH='i386' +# Contributor: Omar Vega Ramos +# Maintainer: Luke T. Shumaker + +# Differences from Arch's `core/grub`: +# +# - Branded for Parabola, not Arch +# +# - Add arch+=(i686) +# +# - Add arch+=(armv7h) +# +# - Add more platforms: +# +# + Arch starts with: +# +# * --with-platform=pc (x86 BIOS) +# * --with-platform=efi (UEFI, x86 and ARM; if +# _IA32_EFI_IN_ARCH_X86=1 then the x86_64 +# package contains both 32bit and 64bit +# builds) +# * --with-platform=emu (if _GRUB_EMU_BUILD=1, user-mode, x86 and ARM) +# +# + Parabola additions, since +# +# "grub: add armv7h support (U-Boot and UEFI)" +# (2015-09-26, Márcio Alexandre Silva Delgado ) +# +# * --with-platform=uboot (ARM) +# +# + Parabola additions, since +# +# "grub: rm unused grub-extras in U-Boot, fix msg on U-Boot build; add IEEE1275 (OpenFirmware) and Libreboot support" +# (2015-09-26, Márcio Alexandre Silva Delgado ) +# +# * --with-platform=ieee1275 (OpenFirmware, x86-only) +# * --with-platform=coreboot (Libreboot, x86-only) +# +# + Parabola additions, since +# +# "grub: add QEMU, XEN and Multiboot support" +# (2015-09-27, Márcio Alexandre Silva Delgado ) +# +# * --with-platform=xen (if _XEN=1, x86-only; if +# _IA32_XEN_IN_ARCH_X86=1 then the x86_64 +# package contains both 32bit and 64bit +# builds) +# * --with-platform=qemu (a separate -kernel file for Qemu, x86-only) +# * --with-platform=multiboot (x86-only) + +## "1" to enable Xen support, "0" to disable +_XEN="0" + +## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable +_IA32_EFI_IN_ARCH_X64="1" + +## "1" to enable IA32-XEN build in Arch x86_64, "0" to disable +_IA32_XEN_IN_ARCH_X64="1" + +## "1" to enable EMU build, "0" to disable +_GRUB_EMU_BUILD="0" + +[[ "${CARCH}" == 'armv7h' ]] && _EFI_ARCH='arm' +[[ "${CARCH}" == 'x86_64' ]] && _EFI_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _EFI_ARCH='i386' + +[[ "${CARCH}" == 'x86_64' ]] && _XEN_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _XEN_ARCH='i386' + +[[ "${CARCH}" == 'armv7h' ]] && _EMU_ARCH='arm' +[[ "${CARCH}" == 'x86_64' ]] && _EMU_ARCH='x86_64' +[[ "${CARCH}" == 'i686' ]] && _EMU_ARCH='i386' pkgbase='grub' pkgname=('grub') -[[ $CARCH = armv7h ]] && pkgname+=('grub-am335x_bone' 'grub-udoo' 'grub-omap3_beagle' - 'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab') -pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)' +if [[ $CARCH == armv7h ]]; then + pkgname+=( + 'grub-am335x_bone' + 'grub-udoo' + 'grub-omap3_beagle' + 'grub-omap3_beagle_xm' + 'grub-omap3_beagle_xm_ab' + ) +fi +pkgdesc='GNU GRand Unified Bootloader (2)' +pkgdesc+=', (Parabola rebranded)' epoch=2 _tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver} _gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3' @@ -41,76 +96,87 @@ _unifont_ver='13.0.06' _pkgver=2.06 pkgver=${_pkgver/-/} pkgrel=1 -pkgrel+=.parabola1 +pkgrel+=.parabola2 url='https://www.gnu.org/software/grub/' arch=('x86_64') -arch+=('i686' 'armv7h') +arch+=('i686') +arch+=('armv7h') license=('GPL3') backup=('etc/default/grub' 'etc/grub.d/40_custom') install="${pkgname}.install" options=('!makeflags') +conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy') +conflicts+=('grub-parabola') +replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") +replaces+=('grub-parabola') +provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") +if [[ "${CARCH}" = 'armv7h' ]]; then + conflicts=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") + replaces=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") + provides=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") +fi + makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' - 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' - 'fuse: For grub-mount usage') + 'fuse2: For grub-mount usage' + #'dosfstools: For grub-mkrescue FAT FS and EFI support' # drop 'and EFI' from the device-specific arm-uboot packages + #'efibootmgr: For grub-install EFI support' # drop from the device-specific arm-uboot packages + #'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' # drop from the device-specific arm-uboot packages + 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' + 'mtools: For grub-mkrescue FAT FS support') if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; then makedepends+=('xen') fi -if [[ "${_GRUB_EMU_BUILD}" = "1" ]]; then - makedepends+=('libusbx' 'sdl') -fi - -if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then - provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}") - conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy' 'grub-parabola') - replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-parabola') -elif [[ "${CARCH}" = 'armv7h' ]]; then - provides=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") - conflicts=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") - replaces=('grub-common' 'grub-emu' "grub-efi-${_EFI_ARCH}") +if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + makedepends+=('libusbx' 'sdl') + #optdepends+=('libusbx: For grub-emu USB support' # drop from the device-specific arm-uboot packages + # 'sdl: For grub-emu SDL support') # drop from the device-specific arm-uboot packages fi validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko 'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper - '95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy + '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed" "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}" "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig} - '0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch' '0001-00_header-add-GRUB_COLOR_-variables.patch' - 'grub.default' - '0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch' - '0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch' - '0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch' - '0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch' - '0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch' - '0003-10_linux-20_linux_xen-rebrand-free-distros.patch') + '0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch' + '0003-10_linux-20_linux_xen-rebrand-free-distros.patch' + 'grub.default') +source_armv7h=( + '1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch' + '1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch' + '1000-omap3_beagle_xm--10_linux-20_linux_xen-detect-devicetree-file.patch' + '1000-omap3_beagle_xm_ab--10_linux-20_linux_xen-detect-devicetree-file.patch' + '1000-udoo--10_linux-20_linux_xen-detect-devicetree-file.patch') sha256sums=('SKIP' 'SKIP' 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5' 'SKIP' - 'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f' '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' - 'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879' - '0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32' - 'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87' - 'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56' - 'f5fb1673536d56a88b3d1aaec75501e4d0acca081ac658d1059ec276f9e062c6' - 'd8911a513166d2db337b9449542e0ad0e91b114f92dc4b876d88d77d23829a1d' - '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4') + 'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f' + '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4' + 'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879') +sha256sums_armv7h=('0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32' + 'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87' + 'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56' + 'f5fb1673536d56a88b3d1aaec75501e4d0acca081ac658d1059ec276f9e062c6' + 'd8911a513166d2db337b9449542e0ad0e91b114f92dc4b876d88d77d23829a1d') _backports=( ) _configure_options=( FREETYPE="pkg-config freetype2" + BUILD_FREETYPE="pkg-config freetype2" --enable-mm-debug --enable-nls --enable-device-mapper @@ -143,10 +209,10 @@ prepare() { echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..." ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html - patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" + patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" echo "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig..." - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch" + patch -Np1 -i "${srcdir}/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch" echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..." sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac" @@ -157,451 +223,248 @@ prepare() { echo "Fix mkinitcpio 'rw' FS#36275..." sed 's| ro | rw |g' -i "util/grub.d/10_linux.in" - echo "Pull in latest language files..." - ./linguas.sh + # linguas.sh rsync's from translationproject.org; this will + # fail with libremakepkg because networking is turned off. + # And we can't "optimistically" run it, because it doesn't do + # error-handling and will delete files that we need. If + # pulling in updated translations is important, then it needs + # to be done prior to prepare(). + # + #echo "Pull in latest language files..." + #./linguas.sh echo "Avoid problem with unifont during compile of grub..." - # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847 + # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847 gzip -cd "${srcdir}/unifont-${_unifont_ver}.bdf.gz" > "unifont.bdf" -} - -_build_grub-efi() { - echo "Copy the source for building the ${_EFI_ARCH} EFI part..." - cp -r "${srcdir}/grub/" "${srcdir}/grub-efi-${_EFI_ARCH}/" - cd "${srcdir}/grub-efi-${_EFI_ARCH}/" - - echo "Unset all compiler FLAGS for ${_EFI_ARCH} EFI build..." - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - echo "Run bootstrap for ${_EFI_ARCH} EFI build..." + echo "Run bootstrap..." ./bootstrap \ --gnulib-srcdir="${srcdir}/gnulib/" \ --no-git - echo "Run ./configure for ${_EFI_ARCH} EFI build..." - ./configure \ - --with-platform="efi" \ - --target="${_EFI_ARCH}" \ - --disable-efiemu \ - --enable-boot-time \ - "${_configure_options[@]}" - - echo "Run make for ${_EFI_ARCH} EFI build..." - make + echo "Make translations reproducible..." + sed -i '1i /^PO-Revision-Date:/ d' po/*.sed } -_build_grub-xen() { - echo "Copy the source for building the ${_XEN_ARCH} XEN part..." - cp -r "${srcdir}/grub/" "${srcdir}/grub-xen-${_XEN_ARCH}/" - cd "${srcdir}/grub-xen-${_XEN_ARCH}/" +# Usage: _build_grub DIRSUFFIX 'Human Description' CPU-PLATFORM CONFIG_OPTIONS... +_build_grub() { + local bld_name="$1" + local bld_desc="$2" + local bld_cpu="${3%-*}" + local bld_plat="${3#*-}" + local bld_configure_options=("${@:4}") + + echo "Build grub ${bld_desc} stuff..." - echo "Unset all compiler FLAGS for ${_XEN_ARCH} XEN build..." + echo "Copy the source for building the ${bld_desc} part..." + cp -r "${srcdir}/grub/" "${srcdir}/grub-${bld_name}/" + cd "${srcdir}/grub-${bld_name}/" + + echo "Unset all compiler FLAGS for ${bld_desc} build..." unset CFLAGS unset CPPFLAGS unset CXXFLAGS unset LDFLAGS unset MAKEFLAGS - echo "Run bootstrap for ${_XEN_ARCH} XEN build..." - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo "Run ./configure for ${_XEN_ARCH} XEN build..." + echo "Run ./configure for ${bld_desc} build..." ./configure \ - --with-platform='xen' \ - --target="${_XEN_ARCH}" \ - --disable-efiemu \ - --enable-boot-time \ - "${_configure_options[@]}" + --with-platform="${bld_plat}" \ + --target="${bld_cpu}" \ + "${bld_configure_options[@]}" + + echo "Make info pages reproducible..." + touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi') - echo "Run make for ${_XEN_ARCH} XEN build..." + echo "Run make for ${bld_desc} build..." make } _build_grub-bios() { - echo 'Set ARCH dependent variables for BIOS build...' - if [[ "${CARCH}" = 'x86_64' ]]; then - _EFIEMU='--enable-efiemu' + echo "Set ARCH dependent variables for bios build..." + local _EFIEMU + if [[ "${CARCH}" == 'x86_64' ]]; then + _EFIEMU="--enable-efiemu" else - _EFIEMU='--disable-efiemu' + _EFIEMU="--disable-efiemu" fi - echo 'Copy the source for building the BIOS part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-bios/" - cd "${srcdir}/grub-bios/" - - echo 'Unset all compiler FLAGS for BIOS build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for BIOS build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for BIOS build...' - ./configure \ - --with-platform='pc' \ - --target='i386' \ + _build_grub 'bios' 'bios' \ + 'i386-pc' \ "${_EFIEMU}" \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for BIOS build...' - make } -_build_grub-qemu() { - echo 'Copy the source for building the QEMU part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-qemu/" - cd "${srcdir}/grub-qemu/" - - echo 'Unset all compiler FLAGS for QEMU build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS +_build_grub-efi() { + _build_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} efi" \ + "${_EFI_ARCH}-efi" \ + --disable-efiemu \ + --enable-boot-time \ + "${_configure_options[@]}" +} - echo 'Run bootstrap for QEMU build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git +_build_grub-emu() { + _build_grub 'emu' 'emu' \ + "${_EMU_ARCH}-emu" \ + --enable-grub-emu-usb=no \ + --enable-grub-emu-sdl=no \ + --disable-grub-emu-pci \ + "${_configure_options[@]}" +} - echo 'Run ./configure for QEMU build...' - ./configure \ - BUILD_FREETYPE="pkg-config freetype2" \ - --with-platform='qemu' \ - --target='i386' \ +_build_grub-xen() { + _build_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ + "${_XEN_ARCH}-xen" \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" +} - echo 'Run make for QEMU build...' - make +_build_grub-qemu() { + _build_grub 'qemu' 'QEMU' \ + 'i386-qemu' \ + --disable-efiemu \ + --enable-boot-time \ + "${_configure_options[@]}" } _build_grub-ieee1275() { - echo 'Copy the source for building the IEEE1275 (OpenFirmware) part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-ieee1275/" - cd "${srcdir}/grub-ieee1275/" - - echo 'Unset all compiler FLAGS for IEEE1275 (OpenFirmware) build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for IEEE1275 (OpenFirmware) build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for IEEE1275 (OpenFirmware) build...' - ./configure \ - --with-platform='ieee1275' \ - --target='i386' \ + _build_grub 'ieee1275' 'IEEE1275 (OpenFirmware)' \ + 'i386-ieee1275' \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for IEEE1275 (OpenFirmware) build...' - make } _build_grub-libreboot() { - echo 'Copy the source for building the Libreboot part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-libreboot/" - cd "${srcdir}/grub-libreboot/" - - echo 'Unset all compiler FLAGS for Libreboot build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for Libreboot build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for Libreboot build...' - ./configure \ - BUILD_FREETYPE="pkg-config freetype2" \ - --with-platform='coreboot' \ - --target='i386' \ + _build_grub 'libreboot' 'Libreboot' \ + 'i386-coreboot' \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for Libreboot build...' - make } _build_grub-multiboot() { - echo 'Copy the source for building the Multiboot part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-multiboot/" - cd "${srcdir}/grub-multiboot/" - - echo 'Unset all compiler FLAGS for Multiboot build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for Multiboot build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for Multiboot build...' - ./configure \ - --with-platform='multiboot' \ - --target='i386' \ + _build_grub 'multiboot' 'Multiboot' \ + 'i386-multiboot' \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for Multiboot build...' - make -} - -_build_grub-emu() { - echo 'Copy the source for building the emu part...' - cp -r "${srcdir}/grub/" "${srcdir}/grub-emu/" - cd "${srcdir}/grub-emu/" - - echo 'Unset all compiler FLAGS for emu build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - echo 'Run bootstrap for emu build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for emu build...' - ./configure \ - --with-platform='emu' \ - --target="${_EMU_ARCH}" \ - --enable-grub-emu-usb=no \ - --enable-grub-emu-sdl=no \ - --disable-grub-emu-pci \ - "${_configure_options[@]}" - - echo 'Run make for emu build...' - make } _build_grub-uboot() { - echo "Copy the source for building the U-Boot part..." - cp -r "${srcdir}/grub/" "${srcdir}/grub-uboot/" - cd "${srcdir}/grub-uboot/" - - echo 'Unset all compiler FLAGS for U-Boot build...' - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - #sed -i '\|grub_arm_disable_caches_mmu|,+4 d - # ' grub-core/loader/arm/linux.c - - echo 'Run bootstrap for U-Boot build...' - ./bootstrap \ - --gnulib-srcdir="${srcdir}/gnulib/" \ - --no-git - - echo 'Run ./configure for U-Boot build...' - ./configure \ - --with-platform='uboot' \ - --target='arm' \ + _build_grub 'uboot' 'U-Boot' \ + 'arm-uboot' \ --disable-efiemu \ --enable-boot-time \ "${_configure_options[@]}" - - echo 'Run make for U-Boot build...' - make } build() { cd "${srcdir}/grub/" - if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then - echo "Build grub ${_EFI_ARCH} EFI stuff..." - _build_grub-efi + # All-CPU platforms #################################################### - if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then - echo 'Build grub i386 EFI stuff...' - _EFI_ARCH='i386' _build_grub-efi - fi + _build_grub-efi + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + _EFI_ARCH="i386" _build_grub-efi fi - if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then - if [[ "${_XEN}" = '1' ]]; then - echo "Build grub ${_XEN_ARCH} XEN stuff..." - _build_grub-xen + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + _build_grub-emu + fi - if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then - echo 'Build grub i386 XEN stuff...' - _XEN_ARCH='i386' _build_grub-xen - fi - fi + # CPU-specific platforms ############################################### - echo 'Build grub BIOS stuff...' + case "$CARCH" in + x86_64|i686) _build_grub-bios - - echo 'Build grub QEMU stuff...' _build_grub-qemu - - echo 'Build grub IEEE1275 (OpenFirmware) stuff...' _build_grub-ieee1275 - - echo 'Build grub Libreboot stuff...' _build_grub-libreboot - - echo 'Build grub Multiboot stuff...' _build_grub-multiboot - elif [[ "${CARCH}" = 'armv7h' ]]; then - echo 'Build grub U-Boot stuff...' + if [[ "${_XEN}" = '1' ]]; then + _build_grub-xen + if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then + _XEN_ARCH='i386' _build_grub-xen + fi + fi + ;; + armv7h) _build_grub-uboot - fi - - if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then - echo 'Build grub emu stuff...' - _build_grub-emu - fi + ;; + esac } -_package_grub-efi() { - cd "${srcdir}/grub-efi-${_EFI_ARCH}/" - - echo "Run make install for ${_EFI_ARCH} EFI build..." - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install +# Usage: _package_grub DIRSUFFIX 'Human Description' CPU-PLATFORM +_package_grub() { + local bld_name="$1" + local bld_desc="$2" + local bld_cpuplat="$3" - echo "Remove gdb debugging related files for ${_EFI_ARCH} EFI build..." - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true -} + echo "Package grub ${bld_desc} stuff..." -_package_grub-xen() { - cd "${srcdir}/grub-xen-${_XEN_ARCH}/" + cd "${srcdir}/grub-${bld_name}/" - echo "Run make install for ${_XEN_ARCH} XEN build..." + echo "Run make install for ${bld_desc} build..." make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - echo "Remove gdb debugging related files for ${_XEN_ARCH} XEN build..." - rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/{kernel.exec,gdb_grub,gmodule.pl} || true + echo "Remove gdb debugging related files for ${bld_desc} build..." + rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/{kernel.exec,gdb_grub,gmodule.pl} || true } _package_grub-bios() { - cd "${srcdir}/grub-bios/" - - echo 'Run make install for BIOS build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + _package_grub 'bios' 'bios' \ + 'i386-pc' +} - echo 'Remove gdb debugging related files for BIOS build...' - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true +_package_grub-efi() { + _package_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} efi" \ + "${_EFI_ARCH}-efi" } -_package_grub-qemu() { - cd "${srcdir}/grub-qemu/" +_package_grub-emu() { + _package_grub 'emu' 'emu' \ + "${_EMU_ARCH}-emu" +} - echo 'Run make install for QEMU build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install +_package_grub-xen() { + _package_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ + "${_XEN_ARCH}-xen" +} - echo 'Remove gdb debugging related files for QEMU build...' - rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/{kernel.exec,gdb_grub,gmodule.pl} || true +_package_grub-qemu() { + _package_grub 'qemu' 'QEMU' \ + 'i386-qemu' } _package_grub-ieee1275() { - cd "${srcdir}/grub-ieee1275/" - - echo 'Run make install for IEEE1275 (OpenFirmware) build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for IEEE1275 (OpenFirmware) build...' - rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'ieee1275' 'IEEE1275 (OpenFirmware)' \ + 'i386-ieee1275' } _package_grub-libreboot() { - cd "${srcdir}/grub-libreboot/" - - echo 'Run make install for Libreboot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for Libreboot build...' - rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'libreboot' 'Libreboot' \ + 'i386-coreboot' } _package_grub-multiboot() { - cd "${srcdir}/grub-multiboot/" - - echo 'Run make install for Multiboot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for Multiboot build...' - rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/{kernel.exec,gdb_grub,gmodule.pl} || true -} - -_package_grub-emu() { - cd "${srcdir}/grub-emu/" - - echo 'Run make install for emu build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for emu build...' - rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'multiboot' 'Multiboot' \ + 'i386-multiboot' } _package_grub-uboot() { - cd "${srcdir}/grub-uboot/" - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub 'uboot' 'U-Boot' \ + 'arm-uboot' } package_grub() { optdepends+=('dosfstools: For grub-mkrescue FAT FS and EFI support' 'efibootmgr: For grub-install EFI support' - 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') + 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue') if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then optdepends+=('libusbx: For grub-emu USB support' @@ -610,214 +473,83 @@ package_grub() { cd "${srcdir}/grub/" - if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then - echo "Package grub ${_EFI_ARCH} EFI stuff..." - _package_grub-efi + # All-CPU platforms #################################################### - if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then - echo 'Package grub i386 EFI stuff...' - _EFI_ARCH='i386' _package_grub-efi - fi + _package_grub-efi + if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then + _EFI_ARCH="i386" _package_grub-efi fi - if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then - if [[ "${_XEN}" = '1' ]]; then - echo "Package grub ${_XEN_ARCH} XEN stuff..." - _package_grub-xen + if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then + _package_grub-emu + fi - if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then - echo 'Package grub i386 XEN stuff...' - _XEN_ARCH='i386' _package_grub-xen - fi - fi + # CPU-specific platforms ############################################### - echo 'Package grub BIOS stuff...' + case "$CARCH" in + x86_64|i686) _package_grub-bios - - echo 'Package grub QEMU stuff...' _package_grub-qemu - - echo 'Package grub IEEE1275 (OpenFirmware) stuff...' _package_grub-ieee1275 - - echo 'Package grub Libreboot stuff...' _package_grub-libreboot - - echo 'Package grub Multiboot stuff...' _package_grub-multiboot - elif [[ "${CARCH}" = 'armv7h' ]]; then - echo 'Package grub U-Boot stuff...' + if [[ "${_XEN}" = '1' ]]; then + _package_grub-xen + if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then + _XEN_ARCH='i386' _package_grub-xen + fi + fi + ;; + armv7h) _package_grub-uboot - fi + ;; + esac - if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then - echo 'Package grub emu stuff...' - _package_grub-emu - fi + # Common ############################################################### - echo 'Install /etc/default/grub (used by grub-mkconfig)...' + echo "Install /etc/default/grub (used by grub-mkconfig)..." install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" } -package_grub-am335x_bone() { - pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBone and BeagleBone Black (am335x-bone), (Parabola rebranded)' - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - - echo "Copy the source for packaging the U-Boot (am335x-bone) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_am335x-bone/" - cd "${srcdir}/grub-uboot_am335x-bone/" +_package_grub-uboot-dev() { + local devname=$1 + local devdesc=$2 - echo 'Patch to detect am335x-bone device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch" + pkgdesc="GNU GRand Unified Bootloader (2) for $devdesc ($devname), (Parabola rebranded)" + optdepends+=('dosfstools: For grub-mkrescue FAT FS') - echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot + echo "Copy the source for packaging the U-Boot ($devname) part..." + cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_$devname/" + cd "${srcdir}/grub-uboot_$devname/" - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install + echo "Patch to detect $devname device tree blob file (dtb)..." + patch -Np1 -i "${srcdir}/1000-${pkgname#grub-}--10_linux-20_linux_xen-detect-devicetree-file.patch" - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true + _package_grub "uboot_$devname" "$devdesc" 'arm' 'uboot' echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" +} - ## echo 'Patch to detect am335x-bone device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch" +package_grub-am335x_bone() { + _package_grub-uboot-dev 'am335x-bone' 'BeagleBone and BeagleBone Black' } package_grub-omap3_beagle() { - pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard (omap3_beagle), (Parabola rebranded)' provides+=('grub-beagleboard') - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - - echo "Copy the source for packaging the U-Boot (omap3_beagle) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_omap3_beagle/" - cd "${srcdir}/grub-uboot_omap3_beagle/" - - echo 'Patch to detect omap3_beagle device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch" - - echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true - - echo 'Install /etc/default/grub (used by grub-mkconfig)...' - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## echo 'Patch to detect omap3_beagle device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch" + _package_grub-uboot-dev "${pkgname#grub-}" 'BeagleBoard' } package_grub-omap3_beagle_xm() { - pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM (omap3_beagle_xm), (Parabola rebranded)' provides+=('grub-beagleboard') - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - - echo "Copy the source for packaging the U-Boot (omap3_beagle_xm) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_omap3_beagle_xm/" - cd "${srcdir}/grub-uboot_omap3_beagle_xm/" - - echo 'Patch to detect omap3_beagle_xm device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch" - - echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true - - echo 'Install /etc/default/grub (used by grub-mkconfig)...' - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## echo 'Patch to detect omap3_beagle_xm device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch" + _package_grub-uboot-dev "${pkgname#grub-}" 'BeagleBoard-xM' } package_grub-omap3_beagle_xm_ab() { - pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM rev A/B (omap3_beagle_xm_ab), (Parabola rebranded)' provides+=('grub-beagleboard') - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - - echo "Copy the source for packaging the U-Boot (omap3_beagle_xm_ab) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_omap3_beagle_xm_ab/" - cd "${srcdir}/grub-uboot_omap3_beagle_xm_ab/" - - echo 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch" - - echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true - - echo 'Install /etc/default/grub (used by grub-mkconfig)...' - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## echo 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch" + _package_grub-uboot-dev "${pkgname#grub-}" 'BeagleBoard-xM rev A/B' } package_grub-udoo() { - pkgdesc='GNU GRand Unified Bootloader (2) for UDOO (udoo), (Parabola rebranded)' - optdepends+=('dosfstools: For grub-mkrescue FAT FS' - 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' - 'mtools: For grub-mkrescue FAT FS support') - - echo "Copy the source for packaging the U-Boot (udoo) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_udoo/" - cd "${srcdir}/grub-uboot_udoo/" - - echo 'Patch to detect udoo device tree blob file (dtb)...' - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch" - - echo 'Package grub U-Boot stuff...' - ## _package_grub-uboot - - echo 'Run make install for U-Boot build...' - make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install - - echo 'Remove gdb debugging related files for U-Boot build...' - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true - rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true - - echo 'Install /etc/default/grub (used by grub-mkconfig)...' - install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - - ## echo 'Patch to detect udoo device tree blob file (dtb)...' - ## cd "${pkgdir}/etc/grub.d/" - ## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch" + _package_grub-uboot-dev "${pkgname#grub-}" 'UDOO' } diff --git a/libre/grub/arm-extra b/libre/grub/arm-extra deleted file mode 100644 index 87d4aa8..0000000 --- a/libre/grub/arm-extra +++ /dev/null @@ -1,333 +0,0 @@ -### ARM_UBOOT - loadaddr ### -# 0x00007fc0 - versatile[versatile_ab/versatile_pb] -# 0x00100000 - snowball/u8500_href -# 0x00800000 - dns325/highbank/wireless_space -# 0x02000000 - zynq[zynq_microzed/zynq_picozed/zynq_zc702/zynq_zc706/zynq_zc70x/zynq_zc770[zynq_zc770_xm010/zynq_zc770_xm012/zynq_zc770_xm013]/zynq_zed/zynq_zybo] -# 0x08000000 - grub -# 0x10800000 - cm_fx6 -# 0x12000000 - aristainetos[aristainetos/aristainetos2]/mx6[mx6slevk/mx6sxsabresd] -# 0x40007000 - origen -# 0x43e00000 - origen -# 0x60008000 - vexpress_ca9x4 -# 0x70800000 - ima3-mx53/mx53evk/mx53smd -# 0x72000000 - mx53ard/mx53loco -# 0x80000000 - am335x_bur[kwb/tseries]/am3517[am3517_crane/am3517_evm]/mcx -# 0x80007fc0 - am335x_ti[pcm051] -# 0x80008000 - vexpress_ca9x4/vexpress[vexpress_ca15_tc2/vexpress_ca5x2](extended-mem) -# 0x80100000 - am335x_bur[kwb]/ls2085a[ls2085a_emu/ls2085a_simu/ls2085aqds/ls2085ardb] -# 0x80200000 - am335x_bur[tseries]/am335x_ti[am335x_evm/omap3_beagle/pengwyn]/ti814x_evm -# 0x80800000 - * flea3/mx31ads/mx35pdk/qong/woodburn/woodburn_sd -# 0x81000000 - ti814x_evm * mx25pdk/omap3_logic/ti816x_evm/tx25 -# 0x82000000 - am335x_ti[am335x_evm/omap3_beagle/pcm051/pengwyn]/am3517[am3517_crane/am3517_evm]/mcx -# /mx6[gw_ventana[gwventana]/mx6cuboxi/mx6qarm2[mx6dlarm2]/mx6qsabreauto[mx6dlsabreauto]/mx6sabresd[mx6dlsabresd/mx6qsabresd]] -# /omap3_ti[devkit8000] -# * bav335x/cm_t335/cm_t3517/dig297/omap3_evm/omap3_igep00x0/omap3_mvblx/omap3_sdp3430/omap3_zoom1/tao3530 -# 0x84000000 - am335x_baltos -# 0x90000000 - vexpress64_base[vexpress_aemv8a_semi]/vexpress64_juno[vexpress_aemv8a_juno] -# 0x90000000UL - ls2085a[ls2085a_emu/ls2085a_simu/ls2085aqds/ls2085ardb] -# 0x90800000 - vision2 -# 0x92000000 - mx51evk -# 0xa0008000 - vexpress[vexpress_ca15_tc2/vexpress_ca5x2](extended-mem) -# 0xa0800000 - imx27lite -# 0xc0000014 - davinci[ea20] -# 0xc0700000 - davinci[ea20] -# 0x12000000 - udoo_dl udoo_quad - -# alt -# am335x_igep0033 -# am43xx_evm -# apalis_t30 -# apf27 -# apx4devkit -# armadillo-800eva -# arndale -# aspenite -# at91rm9200ek -# at91sam9260ek at91sam9g20ek/at91sam9xeek -# at91sam9261ek at91sam9g10ek -# at91sam9263ek -# at91sam9m10g45ek -# at91sam9n12ek -# at91sam9rlek -# at91sam9x5ek -# balloon3 -# bav335x birdland_bav335a/birdland_bav335b -# bcm28155_ap bcm11130/bcm28155_w1d -# bcmcygnus bcm911360/bcm911360k/bcm958300k/bcm958305k -# bcmnsp bcm958622hr -# beagle_x15 -# beaver -# bg0900 -# calimain -# cam_enc_4xx -# cardhu -# cgtqmx6eval cgtqmx6qeval -# cm_t335 -# cm_t3517 -# cm_t35 -# cm_t54 -# colibri_pxa270 -# colibri_t20 -# colibri_t30 -# colibri_vf -# corvus -# cpu9260 cpu9G20 -# cpuat91 -# da830evm -# da850evm da850_am18xxevm -# dalmore -# davinci_dm355evm -# davinci_dm355leopard -# davinci_dm365evm -# davinci_dm6467evm davinci_dm6467Tevm -# davinci_dvevm -# davinci_schmoogie -# davinci_sffsdr -# davinci_sonata -# db-88f6820-gp -# db-mv784mp-gp -# devkit3250 -# devkit8000 -# dig297 -# dockstar -# dra7xx_evm -# draco -# dreamplug -# duovero -# eb_cpux9k2 -# eco5pk -# edb93xx edb9315a -# edminiv2 -# embestmx6boards marsboard/riotboard -# enbw_cmc -# ethernut5 -# flea3 -# goflexhome -# gose -# gplugd -# guruplug -# h2200 -# harmony -# ib62x0 -# iconnect -# imx27lite -# imx31_litekit -# imx31_phycore -# integrator_ap integratorap_cm720t/integratorap_cm920t/integratorap_cm926ej_s/integratorap_cm946es -# integrator_cp integratorcp_cm1136/integratorcp_cm920t/integratorcp_cm926ej_s/integratorcp_cm946es -# ipam390 -# jetson-tk1 -# jornada -# k2e_evm -# k2hk_evm -# k2l_evm -# km_kirkwood kmcoge5un/kmnusa/kmsugp1/kmsuv31/mgcoge3un/portl2 -# koelsch -# kosagi_novena novena -# kzm9g -# lager -# lp8x4x -# ls1021aqds -# ls1021atwr -# lsxl lschlv2/lsxhl -# magnesium -# maxbcm -# mcx -# medcom-wide -# meesc -# m28evk -# m53evk -# mt_ventoux -# mv88f6281gtw_ge -# mx23_olinuxino -# mx23evk -# mx25pdk -# mx28evk -# mx31ads -# mx31pdk -# mx35pdk -# mx51_efikamx mx51_efikasb -# mx51evk -# nas220 -# net2big_v2 d2net_v2 -# netspace_v2 inetspace_v2/netspace_lite_v2/netspace_max_v2/netspace_mini_v2 -# nitrogen6x mx6qsabrelite/nitrogen6dl2g/nitrogen6dl/nitrogen6q2g/nitrogen6q/nitrogen6s1g/nitrogen6s -# nokia_rx51 -# nomadik_nhk8815 -# nyan-big -# odroid -# odroid-xu3 -# omap3_cairo cairo -# omap3_evm -# omap3_evm_quick -# omap3_igep00x0 igep0020/igep0030/igep0032 -# omap3_logic -# omap3_mvblx -# omap3_overo -# omap3_pandora -# omap3_sdp3430 -# omap3_zoom1 -# omap4_panda -# omap4_sdp4430 -# omap5_uevm -# omapl138_lcdk -# openrd -# origen -# ot1200 -# otc570 -# palmld -# palmtreo680 -# paz00 -# peach-pi -# peach-pit -# pengwyn -# pepper -# platinum_picon -# platinum_titanium -# plutux -# pm9261 -# pm9263 -# pm9g45 -# pogo_e02 -# porter -# pxa255_idp -# pxm2 -# qong -# rastaban -# rd6281a -# rpi_2 -# rpi -# rut -# s5p_goni -# s5pc210_universal -# sama5d3_xplained -# sama5d3xek -# sama5d4_xplained -# sama5d4ek -# sansa_fuze_plus -# sc_sps_1 -# scb9328 -# seaboard -# secomx6 secomx6quq7 -# sheevaplug -# silk -# smdk2410 -# smdk5250 -# smdk5420 -# smdkc100 -# smdkv310 -# snapper9260 snapper9g20 -# snow -# socfpga_arria5 -# socfpga_cyclone5 socfpga_socrates -# spear300 -# spear310 -# spear320 -# spear600 -# stamp9g20 portuxg20 -# stm32f429-discovery -# stv0991 -# sun4i-a10-a1000(mele) -# sun4i-a10-ba10-tvbox -# sun4i-a10-chuwi-v7-cw0825 -# sun4i-a10-cubieboard -# sun4i-a10-gemei-g9 -# sun4i-a10-hyundai-a7hd -# sun4i-a10-inet-3f -# sun4i-a10-inet-3w -# sun4i-a10-jesurun-q5 -# sun4i-a10-marsboard -# sun4i-a10-mini-xplus -# sun4i-a10-mk802 -# sun4i-a10-mk802ii -# sun4i-a10-olinuxino-lime -# sun4i-a10-pcduino -# sun5i-a10s-auxtek-t004 -# sun5i-a10s-mk802 -# sun5i-a10s-olinuxino-micro -# sun5i-a10s-r7-tv-dongle -# sun5i-a13-ampe-a76 -# sun5i-a13-forfun-q88db -# sun5i-a13-inet-86vs -# sun5i-a13-olinuxino -# sun5i-a13-olinuxino-micro -# sun5i-a13-tzx-q8-713b7 -# sun5i-a13-utoo-p66 -# sun6i-a31-colombus -# sun6i-a31-hummingbird -# sun6i-a31-i7(mele) -# sun6i-a31-m9(mele) -# sun6i-a31-mele-a1000g-quad -# sun6i-a31-mixtile-loftq -# sun6i-a31s-cs908 -# sun6i-a31s-primo81(msi) -# sun7i-a20-ainol-aw1 -# sun7i-a20-bananapi -# sun7i-a20-bananapro -# sun7i-a20-cubieboard2 -# sun7i-a20-cubietruck -# sun7i-a20-i12-tvbox -# sun7i-a20-m3(mele) -# sun7i-a20-m5(mele) -# sun7i-a20-mk808c -# sun7i-a20-olinuxino-lime -# sun7i-a20-olinuxino-lime2 -# sun7i-a20-olinuxino-micro -# sun7i-a20-orangepi -# sun7i-a20-orangepi-mini -# sun7i-a20-pcduino3 -# sun7i-a20-pcduino3-nano -# sun7i-a20-primo73(msi) -# sun7i-a20-wexler-tab7200 -# sun7i-a20-wits-pro-a20-dkt -# sun7i-a20-yones-toptech-bd1078 -# sun8i-a23-ippo-q8h-v1.2 -# sun8i-a23-ippo-q8h-v5 -# sun8i-a33-et-q8-v1.6 -# sun8i-a33-ga10h-v1.1 -# sun8i-a33-ippo-q8h-v1.2 -# sun8i-a33-sinlinx-sina33 -# sun9i-a80-optimus(merri) -# tao3530 omap3_ha -# taurus axm -# tbs2910 -# tec -# tec-ng -# thuban -# ti814x_evm -# ti816x_evm -# titanium -# tk71 -# tqma6 tqma6q_mba6/tqma6s_mba6 -# trats -# trats2 -# tricorder -# trimslice -# trizepsiv polaris -# tseries -# tt01 -# twister -# tx25 -# uniphier-ph1-ld4-ref -# uniphier-ph1-pro4-ref -# uniphier-ph1-sld8-ref -# usb_a9263 -# usbarmory -# VCMA9 -# venice2 -# ventana -# vf610twr -# vl_ma2sc -# vpac270 -# wandboard -# warp -# whistler -# woodburn -# woodburn_sd -# work_92105 -# x600 -# xaeniax -# xfi3 -# xilinx_zynqmp -# zipitz2 -# zmx25 From 49ff6428650cd63580e6499533c3f5d08f8893ed Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Jan 08 2024 16:50:55 +0000 Subject: [PATCH 45/73] pcr/python-py3dns: Build for newer Python, clean up --- diff --git a/pcr/python-py3dns/PKGBUILD b/pcr/python-py3dns/PKGBUILD index b6a5dae..e046259 100644 --- a/pcr/python-py3dns/PKGBUILD +++ b/pcr/python-py3dns/PKGBUILD @@ -3,15 +3,14 @@ # Contributor: Samed Beyribey pkgname=python-py3dns -_pkgname=py3dns +_pkgname=${pkgname#python-} pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A module for looking up DNS entries in Python applications" arch=('any') -url="https://launchpad.net/py3dns" -license=('custom:PSF') +url="https://launchpad.net/${_pkgname}" +license=('custom:PSF-like') -depends=('python') makedepends=('python-setuptools') source=("https://launchpad.net/${_pkgname}/trunk/${pkgver}/+download/${_pkgname}-${pkgver}.tar.gz"{,.asc}) @@ -19,63 +18,16 @@ md5sums=('35a441081a1acfa0cf78e7ccc2ff9449' 'SKIP') validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Donald Scott Kitterman - -_version_constraint() # (dep_pkgname [precision]) -{ - Log() { [[ "${FUNCNAME[2]}" == package ]] && echo "$@" >&2 || : ; } - - - local dep_pkgname=$1 - declare -i req_precision=$2 - local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} 2> /dev/null | tail -n 1) - local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;) - local def_precision=$(( n_dots + 1 )) - local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision )) - local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision}) - local pkgver_rx='[0-9A-Za-z_]+' - pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed, - # but some pkgver have it (eg: 5.15.10+kde+r130) - local subver_rx='\.'${pkgver_rx} - local pkgrel_rx='[0-9]+' - local garbage_rx='[^0-9].*' - local capture_rx=${pkgver_rx} - for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ; - local version pkgrel has_dot_char version_min version_max constraint_string - declare -i subver subver_inc pkgrel_inc - - if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]] - then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision - #unused=${BASH_REMATCH[2]} # discarded pkgver segments - pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed - has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; ) - subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric - version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} ) - subver_inc=$(( subver + 1 )) - pkgrel_inc=$(( pkgrel + 1 )) - version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \ - echo ${version} ) - version_max=$( ( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel_inc} ) || \ - ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} ) || \ - echo ${subver_inc} ) - constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}" - - Log "Applied version constraint: '${constraint_string}'" - else Log "ERROR: in _version_constraint() parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" - exit 1 - fi - - unset -f Log - - echo -n "${constraint_string}" +build() { + cd "$_pkgname-$pkgver" + python setup.py build } - package() { - # pin to strongly-coupled dependency versions - depends=( ${depends[*]/python/} $(_version_constraint python 2) ) - - cd "$srcdir"/$_pkgname-$pkgver + _python_version=$(pacman -S --print-format='%v' python|cut -d- -f1|cut -d. -f1,2) + depends=("python>=${_python_version}" "python<${_python_version%.*}.$(( ${_python_version##*.} + 1 ))") + cd "$_pkgname-$pkgver" python setup.py install --root="$pkgdir/" --optimize=1 install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } From 2d87219c0bdb473e079862fac98f7563088b8e55 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 08 2024 17:31:43 +0000 Subject: [PATCH 46/73] pcr/python-py3dns: udgpkg 3.2.1→4.0.0 This is a "major-version-bump" breaking change in that it dropped the `DnsAsyncRequest` class, which is broken in Python 3.12, which dropped `asynccore`. Anything that needed `DnsAsyncRequest` also needed `asynccore` and so needs adjusted for new Python anyway. --- diff --git a/pcr/python-py3dns/PKGBUILD b/pcr/python-py3dns/PKGBUILD index e046259..e688b88 100644 --- a/pcr/python-py3dns/PKGBUILD +++ b/pcr/python-py3dns/PKGBUILD @@ -4,23 +4,41 @@ pkgname=python-py3dns _pkgname=${pkgname#python-} -pkgver=3.2.1 -pkgrel=3 +pkgver=4.0.0 +pkgrel=1 pkgdesc="A module for looking up DNS entries in Python applications" arch=('any') url="https://launchpad.net/${_pkgname}" license=('custom:PSF-like') -makedepends=('python-setuptools') +makedepends=('python-build' 'python-installer' 'python-wheel' 'python-flit') source=("https://launchpad.net/${_pkgname}/trunk/${pkgver}/+download/${_pkgname}-${pkgver}.tar.gz"{,.asc}) -md5sums=('35a441081a1acfa0cf78e7ccc2ff9449' +md5sums=('1dddc2621ced329a84a814eae1f92a39' 'SKIP') validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Donald Scott Kitterman build() { cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --no-isolation +} + +check() { + if ! getent hosts parabola.nu >/dev/null; then + # The tests require networking, which is disabled in libremakepkg + # (for good reason). But it's a bummer for these tests. + # https://labs.parabola.nu/issues/3565 + return + fi + + cd "$_pkgname-$pkgver" + for tstfile in ./test.py tests/*; do + echo "Running $tstfile..." + case "$tstfile" in + tests/test5.py) PYTHONPATH=. "$tstfile" parabola.nu;; + *) PYTHONPATH=. "$tstfile";; + esac + done } package() { @@ -28,6 +46,11 @@ package() { depends=("python>=${_python_version}" "python<${_python_version%.*}.$(( ${_python_version##*.} + 1 ))") cd "$_pkgname-$pkgver" - python setup.py install --root="$pkgdir/" --optimize=1 - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + python -m installer --destdir="$pkgdir" dist/*.whl + + # Symlink license file + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + install -d "$pkgdir/usr/share/licenses/$pkgname" + ln -s "$site_packages/${pkgname#python-}-$pkgver.dist-info/licenses/LICENSE" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } From 927f1eb2952f77b69cb14e6240bb01d59794924e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Jan 08 2024 17:31:43 +0000 Subject: [PATCH 47/73] pcr/python-pyspf: Build for newer Python, clean up --- diff --git a/pcr/python-pyspf/PKGBUILD b/pcr/python-pyspf/PKGBUILD index 76a864f..13376cc 100644 --- a/pcr/python-pyspf/PKGBUILD +++ b/pcr/python-pyspf/PKGBUILD @@ -4,82 +4,36 @@ # Contributor: Samed Beyribey pkgname=python-pyspf +_pkgname=${pkgname#python-} pkgver=2.0.14 -pkgrel=2 +pkgrel=3 pkgdesc="Python implementation of the Sender Policy Framework (SPF) protocol" arch=('any') -url="https://pypi.python.org/pypi/pyspf" +url="https://pypi.python.org/pypi/${_pkgname}" license=('PSF') -makedepends=('python-setuptools') -depends=('python-py3dns' 'python') +makedepends=('python-build' 'python-installer' 'python-wheel' 'python-setuptools') +depends=('python-py3dns') +checkdepends=('python-yaml' 'python-authres') optdepends=('python-authres: Return RFC 5451 Authentication Results headers') -source=("https://files.pythonhosted.org/packages/d4/dc/5b3838ff90474e21fe0914920c53430f73402e07d6598ea228e61b74963e/pyspf-$pkgver.tar.gz") +source=("https://files.pythonhosted.org/packages/d4/dc/5b3838ff90474e21fe0914920c53430f73402e07d6598ea228e61b74963e/${_pkgname}-$pkgver.tar.gz") sha256sums=('57a7ef01bda090173aafb6af0106251686ed73f03db4e911fcd34c57fc347186') - -_version_constraint() # (dep_pkgname [precision]) -{ - Log() { [[ "${FUNCNAME[2]}" == package ]] && echo "$@" >&2 || : ; } - - - local dep_pkgname=$1 - declare -i req_precision=$2 - local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} 2> /dev/null | tail -n 1) - local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;) - local def_precision=$(( n_dots + 1 )) - local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision )) - local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision}) - local pkgver_rx='[0-9A-Za-z_]+' - pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed, - # but some pkgver have it (eg: 5.15.10+kde+r130) - local subver_rx='\.'${pkgver_rx} - local pkgrel_rx='[0-9]+' - local garbage_rx='[^0-9].*' - local capture_rx=${pkgver_rx} - for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ; - local version pkgrel has_dot_char version_min version_max constraint_string - declare -i subver subver_inc pkgrel_inc - - if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]] - then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision - #unused=${BASH_REMATCH[2]} # discarded pkgver segments - pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed - has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; ) - subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric - version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} ) - subver_inc=$(( subver + 1 )) - pkgrel_inc=$(( pkgrel + 1 )) - version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \ - echo ${version} ) - version_max=$( ( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel_inc} ) || \ - ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} ) || \ - echo ${subver_inc} ) - constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}" - - Log "Applied version constraint: '${constraint_string}'" - else Log "ERROR: in _version_constraint() parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" - exit 1 - fi - - unset -f Log - - echo -n "${constraint_string}" -} - - build() { - cd "$srcdir/pyspf-$pkgver" + cd "$_pkgname-$pkgver" + python -m build --wheel --no-isolation +} - python setup.py build +check() { + cd "$_pkgname-$pkgver/test" + PYTHONPATH=../build/lib python testspf.py } package() { - # pin to strongly-coupled dependency versions - depends=( ${depends[*]/python/} $(_version_constraint python 2) ) - - cd "$srcdir/pyspf-$pkgver" + _python_version=$(pacman -S --print-format='%v' python|cut -d- -f1|cut -d. -f1,2) + depends+=("python>=${_python_version}" "python<${_python_version%.*}.$(( ${_python_version##*.} + 1 ))") - python setup.py install --root="$pkgdir" --optimize=1 + cd "$_pkgname-$pkgver" + python -m installer --destdir="$pkgdir" dist/*.whl } From 3fa456b4deb64dfa392a6a3ec9adaa86da64ed98 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Jan 08 2024 17:39:49 +0000 Subject: [PATCH 48/73] pcr/pypolicyd-spf: Build for newer Python, clean up --- diff --git a/pcr/pypolicyd-spf/PKGBUILD b/pcr/pypolicyd-spf/PKGBUILD index 6e37f71..72d333a 100644 --- a/pcr/pypolicyd-spf/PKGBUILD +++ b/pcr/pypolicyd-spf/PKGBUILD @@ -6,87 +6,38 @@ pkgname=pypolicyd-spf pkgver=2.0.2 _pkgver=${pkgver%.*} -pkgrel=4 +pkgrel=5 pkgdesc="Python Postfix Sender Policy Framework (SPF) filter daemon" arch=('any') url="https://launchpad.net/${pkgname}/" license=('GPL') makedepends=('python-setuptools') -depends=('postfix' 'python-pyspf' 'python') +depends=('postfix' 'python-pyspf') optdepends=('python-authres: RFC 7001 Authentication-Results header support') options=(!emptydirs) backup=(etc/python-policyd-spf/policyd-spf.conf) -source=(https://launchpad.net/$pkgname/${_pkgver}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc}) +source=("https://launchpad.net/$pkgname/${_pkgver}/$pkgver/+download/$pkgname-$pkgver.tar.gz"{,.asc}) md5sums=('cc50281cc13a8984de058ddc5ae8dcaf' 'SKIP') validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Donald Scott Kitterman - -_version_constraint() # (dep_pkgname [precision]) -{ - Log() { [[ "${FUNCNAME[2]}" == package ]] && echo "$@" >&2 || : ; } - - - local dep_pkgname=$1 - declare -i req_precision=$2 - local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} 2> /dev/null | tail -n 1) - local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;) - local def_precision=$(( n_dots + 1 )) - local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision )) - local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision}) - local pkgver_rx='[0-9A-Za-z_]+' - pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed, - # but some pkgver have it (eg: 5.15.10+kde+r130) - local subver_rx='\.'${pkgver_rx} - local pkgrel_rx='[0-9]+' - local garbage_rx='[^0-9].*' - local capture_rx=${pkgver_rx} - for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ; - local version pkgrel has_dot_char version_min version_max constraint_string - declare -i subver subver_inc pkgrel_inc - - if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]] - then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision - #unused=${BASH_REMATCH[2]} # discarded pkgver segments - pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed - has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; ) - subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric - version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} ) - subver_inc=$(( subver + 1 )) - pkgrel_inc=$(( pkgrel + 1 )) - version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \ - echo ${version} ) - version_max=$( ( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel_inc} ) || \ - ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} ) || \ - echo ${subver_inc} ) - constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}" - - Log "Applied version constraint: '${constraint_string}'" - else Log "ERROR: in _version_constraint() parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" - exit 1 - fi - - unset -f Log - - echo -n "${constraint_string}" -} - - build() { - cd "$srcdir"/$pkgname-$pkgver - - python setup.py build || return 1 + cd "$pkgname-$pkgver" + # Don't use build a modern 'wheel' instead of 'egg' (and so don't + # use modern 'python-builder' and 'python-installer'). The way + # setup.py is written, the 'wheel' will be broken and won't + # correctly install files in '/etc'. + python setup.py build } package() { - # pin to strongly-coupled dependency versions - depends=( ${depends[*]/python/} $(_version_constraint python 2) ) - - cd "$srcdir"/$pkgname-$pkgver + _python_version=$(pacman -S --print-format='%v' python|cut -d- -f1|cut -d. -f1,2) + depends+=("python>=${_python_version}" "python<${_python_version%.*}.$(( ${_python_version##*.} + 1 ))") - python setup.py install --root="$pkgdir/" --optimize=1 || return 1 - install -m644 policyd-spf.conf.commented "$pkgdir"/etc/python-policyd-spf || return 1 + cd "$pkgname-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 + install -m644 policyd-spf.conf.commented "$pkgdir"/etc/python-policyd-spf } From 0d82c00a676bccfa6db2c38a9958622d5e28c20d Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 10 2024 00:05:34 +0000 Subject: [PATCH 49/73] [your-freedom][your-gaming-freedom][your-privacy][your-init-freedom]: normalize related recipes (bugfix) --- diff --git a/libre/your-gaming-freedom/PKGBUILD b/libre/your-gaming-freedom/PKGBUILD index 549c938..7ff42cb 100644 --- a/libre/your-gaming-freedom/PKGBUILD +++ b/libre/your-gaming-freedom/PKGBUILD @@ -24,7 +24,7 @@ license=(custom:CCPL:zero) makedepends=(librelib) install=${pkgname}.install _srcname=${pkgname}-blacklist-${_srcver}.txt -source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_srcver}) +source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_srcver}) sha256sums=('62def808e6f25d9e63cf0e13420e40631aee11cfd68391224b2658e29ad03970') diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD index d234981..5517b68 100644 --- a/nonprism/your-privacy/PKGBUILD +++ b/nonprism/your-privacy/PKGBUILD @@ -24,7 +24,7 @@ makedepends=(librelib) backup=(etc/NetworkManager/conf.d/20-connectivity.conf) install=${pkgname}.install _srcname=${pkgname}-blacklist-${_srcver}.txt -source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_srcver}) +source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_srcver}) source+=(archlinux-keyring.hook) sha512sums=('9ab837a9ca351bb844ecdfc147d69ec1f0d1971fbe12ceeed3b837fc59c54b10d2476901e60f677b0f53166a805b493b0a8bcd638e9e6638012dd454c7930cf8' diff --git a/nonsystemd/your-init-freedom/PKGBUILD b/nonsystemd/your-init-freedom/PKGBUILD index 249e174..84e85ea 100644 --- a/nonsystemd/your-init-freedom/PKGBUILD +++ b/nonsystemd/your-init-freedom/PKGBUILD @@ -25,7 +25,7 @@ replaces=(your-initfreedom) makedepends=(librelib) install=${pkgname}.install _srcname=${pkgname}-blacklist-${_srcver}.txt -source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_srcver}) +source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_srcver}) sha256sums=('6dbe07d8f0fe38d90a1b6811ecfd2543f4638a94a36954256d3b6d1432768891') From 4384252c24b8c67b8e5c68a7ebbe0009176b41ea Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 10 2024 00:05:46 +0000 Subject: [PATCH 50/73] your-freedom:your-privacy: move 'netsurf' to [nonprism] --- diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 4002b04..cfd8643 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -11,8 +11,8 @@ pkgname=your-freedom -pkgver=20240103 -_srcver=4a4e77e8b0157e1d993d331140caff5a5bed3bbb +pkgver=20240109 +_srcver=c0ef727454805ce736bb8133b0546d060c0f774d pkgrel=1 pkgdesc="This meta-package conflicts with every known non-free Arch package" arch=(any) @@ -25,7 +25,7 @@ install=${pkgname}.install _srcname=${pkgname}-blacklist-${_srcver}.txt source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_srcver}) -sha256sums=('07c9400deef1d96cc6c470a8a88ccd0cde222d085cb7eb557b9b95a00e8d8073') +sha256sums=('53c29b21a06e6643e45fcb1506cd393dbf056824597d8e1b9dbf5fa8e58dddc9') package() diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD index 5517b68..decef76 100644 --- a/nonprism/your-privacy/PKGBUILD +++ b/nonprism/your-privacy/PKGBUILD @@ -11,9 +11,9 @@ pkgname=your-privacy -pkgver=20221006 -pkgrel=2 -_srcver=ab32447a5a47a2a5ec5a3fa6043dc6b9024e3674 +pkgver=20240109 +_srcver=c0ef727454805ce736bb8133b0546d060c0f774d +pkgrel=1 pkgdesc="This package will remove support for protocols and services known to endanger privacy." arch=(any) url=https://wiki.parabola.nu/Blacklist @@ -27,8 +27,8 @@ _srcname=${pkgname}-blacklist-${_srcver}.txt source=(${_srcname}::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_srcver}) source+=(archlinux-keyring.hook) -sha512sums=('9ab837a9ca351bb844ecdfc147d69ec1f0d1971fbe12ceeed3b837fc59c54b10d2476901e60f677b0f53166a805b493b0a8bcd638e9e6638012dd454c7930cf8' - '864b419e3aec86adc3ee2cc49ccba69e209f53cf174e889f25c21b0f0813760432e98e7eb024d30376163efec2a6e6d2693a871d895d7de5133bcd2f4df9626b') +sha256sums=('19c5161d9560c9acacf5931934b24141df6b90c91d8f3fd4d202a6a3f6be595e' + '908ee242989fbf932ff013238ad9c56f9b318c21988199a7dcf404df058d4879') package() From 926310f0a1de6425018410e41d485a78d217a31a Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 10 2024 00:05:59 +0000 Subject: [PATCH 51/73] pacman-mirrorlist: upgrade to v20240109 --- diff --git a/libre/pacman-mirrorlist/PKGBUILD b/libre/pacman-mirrorlist/PKGBUILD index d0eafdb..74b16af 100644 --- a/libre/pacman-mirrorlist/PKGBUILD +++ b/libre/pacman-mirrorlist/PKGBUILD @@ -3,16 +3,21 @@ # Contributor: Isaac David # Contributor: André Silva # Contributor: Esteban Carnevale +# Maintainer: Parabola Hackers +# Contributor: bill-auger -# Note: building and publishing this package is a bit peculiar -# 1: modify 'mirrorlist.txt' on the tier-0 repo server root -# 4: set 'pkgver' to YYYYMMDD -# 2: update 'sha256sums' (`makepkg -g`, `sha256sums`, `upgpkg`, etc) +# NOTE: building and publishing this package is a bit peculiar +# modify '/mirrorlist.txt' on the tier-0 repo server: +# 1: update list of mirrors +# 2: update "Last Updated:" to YYYY-MM-DD +# modify this PKGBUILD: +# 3: set 'pkgver' to YYYYMMDD +# 4: update 'sha256sums' (`makepkg -g`, `sha256sums`, `upgpkg`, etc) pkgname=pacman-mirrorlist -pkgver=20230828 +pkgver=20240109 pkgrel=1.parabola1 pkgdesc="Parabola GNU/Linux-libre mirror list for use by pacman" arch=(any) @@ -22,7 +27,7 @@ license=(GPL) backup=(etc/pacman.d/mirrorlist) source=(mirrorlist-${pkgver}.txt::https://repo.parabola.nu/mirrorlist.txt) -sha256sums=('ad810abb9b99b8b94e158964958f425a7ea65601355a280536c48c833d643d65') +sha256sums=('2677d42da3bebb12b2b26cb1ea7f42efdc80db6bc3e3d483dd202acb2c1e443a') prepare() From a46179d7d6002979109613a494ce06bc12deb04b Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 10 2024 02:34:08 +0000 Subject: [PATCH 52/73] libre/systemd: Implement Arch's RFC 25 This is essentially cherry-picking: https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/commit/7ac69a1c24a04f84fafd04ed57a7f5a0d65abc07 Without this, systemd users who -Syu will reboot to find a broken system. So I'm prioritizing this over updating our systemd, which is a couple versions out-of-date. --- diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index ffaa16d..dddff10 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -13,7 +13,7 @@ _tag='eb0f8fc41511dda1f9e0d19e830cc8c6668a2628' # git rev-parse v${_tag_name} _tag_name=253 pkgver="${_tag_name/-/}" pkgrel=1 -pkgrel+=.parabola1 +pkgrel+=.parabola2 arch=('x86_64') arch+=('i686' 'armv7h' 'ppc64le') url='https://www.github.com/systemd/systemd' @@ -257,7 +257,7 @@ check() { package_systemd() { pkgdesc='system and service manager' license=('LGPL2.1') - depends=('bash' 'dbus' 'kbd' 'kmod' 'libkmod.so' + depends=('bash' 'dbus' 'dbus-units' 'kbd' 'kmod' 'libkmod.so' 'systemd-libs' 'pam' 'libelf' 'util-linux' 'pcre2') depends+=("systemd-common=$pkgver-$pkgrel" 'udev') From 043c37d6678c766b4e2050b1c9cb6641985bb0bf Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 10 2024 02:57:37 +0000 Subject: [PATCH 53/73] netsurf: dos2unix privacy patch --- diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD index a010df7..9c535f2 100644 --- a/libre/netsurf/PKGBUILD +++ b/libre/netsurf/PKGBUILD @@ -30,7 +30,7 @@ source=("https://download.netsurf-browser.org/netsurf/releases/source-full/netsu source+=(remove_nonprivacy_options.patch) sha256sums=('495adf6b6614ce36fca6c605f7c321f9cb4a3df838043158122678ce2b3325b7' '34c1f41c02ff3791a1b734197d99ec7f58c403dee05f0f9b7b9b3509d32b51ac') -sha256sums+=('0e5bf14693b932a718a2018689602376b08ff4e41f4530aa1e345180db9c8b43') +sha256sums+=('ad28e66321da74cdf93584a68e89a33eed5077702d4bbcc6f5fd9c174607626a') prepare() { diff --git a/libre/netsurf/remove_nonprivacy_options.patch b/libre/netsurf/remove_nonprivacy_options.patch index 9c18068..cf6b40f 100644 --- a/libre/netsurf/remove_nonprivacy_options.patch +++ b/libre/netsurf/remove_nonprivacy_options.patch @@ -510,72 +510,72 @@ index 0000000..62dc1bb --- /dev/null +++ b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf @@ -0,0 +1,66 @@ -+ -+ -+Welkom bij NetSurf -+ -+ -+ -+ -+

NetSurf

-+ -+ -+ -+
-+

Welkom bij NetSurf

-+ -+

NetSurf is een kleine, snelle webbrowser met open broncode. Wij willen altijd onze browser nog beter maken. Neem dus contact op met de ontwikkelaars (in het Engels!) of met de vertalers (gewoon in het Nederlands) mocht je verbeteringsvoorstellen hebben en/of problemen ervaren. Bedankt dat je voor NetSurf hebt gekozen.

-+ -+
-+
-+ -+ -+
-+
-+ -+
-+ -+

Nieuws

-+

-+ -+

RISC OS

-+

-+ -+

Techniek

-+

-+ -+

Zoeken

-+

-+
-+ -+
-+

NetSurf is beschikbaar overeenkomstig GNU Public Licentie, versie 2

-+
-+
-+ -+ -+ ++ ++ ++Welkom bij NetSurf ++ ++ ++ ++ ++

NetSurf

++ ++ ++ ++
++

Welkom bij NetSurf

++ ++

NetSurf is een kleine, snelle webbrowser met open broncode. Wij willen altijd onze browser nog beter maken. Neem dus contact op met de ontwikkelaars (in het Engels!) of met de vertalers (gewoon in het Nederlands) mocht je verbeteringsvoorstellen hebben en/of problemen ervaren. Bedankt dat je voor NetSurf hebt gekozen.

++ ++
++
++ ++ ++
++
++ ++
++ ++

Nieuws

++

++ ++

RISC OS

++

++ ++

Techniek

++

++ ++

Zoeken

++

++
++ ++
++

NetSurf is beschikbaar overeenkomstig GNU Public Licentie, versie 2

++
++
++ ++ ++ diff --git a/netsurf/resources/SearchEngines b/netsurf/resources/SearchEngines index 38e7795..c4dd5e2 100644 --- a/netsurf/resources/SearchEngines From 155ff504734052055c355651e734627a366380c1 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 10 2024 02:58:00 +0000 Subject: [PATCH 54/73] [netsurf]: upgrade to v3.11 - move to [nonprism] --- diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD deleted file mode 100644 index 9c535f2..0000000 --- a/libre/netsurf/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# Maintainer (arch): Alexander F. Rødseth -# Contributor: Paulo Matias -# Contributor: Georgij Kondratjev -# Contributor: Daniel J Griffiths -# Contributor: André Silva -# Maintainer: Omar Vega Ramos - - -# parabola changes and rationale: -# - remove/replace non-privacy remote services - - -pkgname=netsurf -pkgver=3.10 -pkgrel=3 -pkgrel+=.parabola1 -pkgdesc='Lightweight and fast web browser' -pkgdesc+=', without non-privacy remote services' -arch=(x86_64) -arch+=(armv7h i686) -url='https://www.netsurf-browser.org/' -license=(MIT GPL2) -depends=(bash curl gtk3 'libhubbub=0.3.7' libjpeg-turbo 'libnsutils=0.1.0' - 'libutf8proc>=2.6.0' 'libwapcaplet>=0.4.3' 'libdom>=0.4.1' libwebp) -# vim is needed only for xxd when building -makedepends=(check inetutils 'libcss>=0.9.1' 'libnsbmp>=0.1.6' - 'libnsgif>=0.2.1' 'nsgenbind>=0.8' perl-html-parser setconf vim) -source=("https://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz" - netsurf.sh) -source+=(remove_nonprivacy_options.patch) -sha256sums=('495adf6b6614ce36fca6c605f7c321f9cb4a3df838043158122678ce2b3325b7' - '34c1f41c02ff3791a1b734197d99ec7f58c403dee05f0f9b7b9b3509d32b51ac') -sha256sums+=('ad28e66321da74cdf93584a68e89a33eed5077702d4bbcc6f5fd9c174607626a') - - -prepare() { - cd "$pkgname-all-$pkgver/$pkgname" - - # Fix compilation issues - sed -i 's:libutf8proc/::;s:UTF8PROC_CCC_VIRAMA:UTF8PROC_BIDI_CLASS_EN:' utils/idna.c - # Use "netsurf" as the name of the executable in /usr/bin - setconf frontends/gtk/res/netsurf-gtk.desktop 'Exec=netsurf %u' - - # remove/replace non-privacy remote services - cd "${srcdir}"/$pkgname-all-$pkgver/ - echo "applying remove_nonprivacy_options.patch" - patch -p1 -i ../remove_nonprivacy_options.patch -} - -build() { - CFLAGS="$CFLAGS -w -Os -funroll-loops" \ - make -C "$pkgname-all-$pkgver/$pkgname" \ - NETSURF_UA_FORMAT_STRING='"NetSurf/%d.%d (%s; Arch Linux)"' \ - TARGET=gtk3 \ - LIBDIR=lib \ - INCLUDEDIR=include \ - PREFIX=/usr -} - -package() { - make -C "$pkgname-all-$pkgver/$pkgname" \ - TARGET=gtk3 \ - LIBDIR=lib \ - INCLUDEDIR=include \ - DESTDIR="$pkgdir" \ - PREFIX=/usr \ - install - - # Launch script - install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname" - - cd "$pkgname-all-$pkgver/$pkgname" - - # Desktop icon and shortcut - install -Dm644 frontends/gtk/res/$pkgname.xpm \ - "$pkgdir/usr/share/pixmaps/$pkgname.xpm" - install -Dm644 frontends/gtk/res/$pkgname-gtk.desktop \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - - # License - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} diff --git a/libre/netsurf/netsurf.sh b/libre/netsurf/netsurf.sh deleted file mode 100644 index 1a153a5..0000000 --- a/libre/netsurf/netsurf.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -# Use English if a directory for the current language does not exist -test -d "/usr/share/netsurf/${LANG:0:2}" || export LANG=en_US.UTF-8 -/usr/bin/netsurf-gtk3 "$@" diff --git a/libre/netsurf/remove_nonprivacy_options.patch b/libre/netsurf/remove_nonprivacy_options.patch deleted file mode 100644 index cf6b40f..0000000 --- a/libre/netsurf/remove_nonprivacy_options.patch +++ /dev/null @@ -1,605 +0,0 @@ -diff --git a/netsurf/desktop/searchweb.c b/netsurf/desktop/searchweb.c -index 2c0873d..6efdf62 100644 ---- a/netsurf/desktop/searchweb.c -+++ b/netsurf/desktop/searchweb.c -@@ -34,9 +34,9 @@ - #include "desktop/gui_internal.h" - - struct search_provider { -- char *name; /**< readable name such as 'google', 'yahoo', etc */ -- char *hostname; /**< host address such as www.google.com */ -- char *searchstring; /** < such as "www.google.com?search=%s" */ -+ char *name; /**< readable name such as 'duckduckgo', 'seeks', etc */ -+ char *hostname; /**< host address such as www.duckduckgo.com/html */ -+ char *searchstring; /** < such as "www.duckduckgo.com/html/?q=%s" */ - char *ico; /** < location of domain's favicon */ - hlcache_handle *ico_handle; - }; -@@ -52,7 +52,7 @@ static struct search_web_ctx_s { - } search_web_ctx; - - --static const char *default_providers = "Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico|\n"; -+static const char *default_providers = "Google|www.google.com|http://duckduckgo.com/html/?q=%s|http://www.google.com/favicon.ico|\n"; - - static const char *default_search_icon_url = "resource:icons/search.png"; - -diff --git a/netsurf/frontends/amiga/dist/NetSurf.guide b/netsurf/frontends/amiga/dist/NetSurf.guide -index 0bdd900..e2be43c 100755 ---- a/netsurf/frontends/amiga/dist/NetSurf.guide -+++ b/netsurf/frontends/amiga/dist/NetSurf.guide -@@ -308,13 +308,13 @@ eg. - | - +- -- - | -- +- Google -+ +- DuckDuckGo HTML - - Will look something like the following within the menu: - - |NetSurf �| - |NetSurf Homepage | - |---------| |More NetSurf links| --|Google | -+|DuckDuckGo HTML | - - @endnode - -diff --git a/netsurf/frontends/gtk/res/options.gtk2.ui b/netsurf/frontends/gtk/res/options.gtk2.ui -index 907d0b5..a2de65c 100644 ---- a/netsurf/frontends/gtk/res/options.gtk2.ui -+++ b/netsurf/frontends/gtk/res/options.gtk2.ui -@@ -188,68 +188,17 @@ - - - -- -- Google -- -- -- Yahoo! -- -- -- Microsoft Live -- -- -- Buisiness.com -- -- -- Omgili -- -- -- BBC News -- -- -- Ubuntu Packages -- - - Creative Commons - -- -- Ask -- -- -- Answers -- - - Dictionary.com - -- -- YouTube -- -- -- AeroMP3 -- -- -- AOL -- -- -- Baidu -- -- -- Amazon -- -- -- Ebay -- -- -- IMBD -- -- -- ESPN -- - - Wikipedia - - -- DuckDuckGo -+ DuckDuckGo HTML - - - -diff --git a/netsurf/frontends/gtk/res/options.gtk3.ui b/netsurf/frontends/gtk/res/options.gtk3.ui -index 82a3e17..029af01 100644 ---- a/netsurf/frontends/gtk/res/options.gtk3.ui -+++ b/netsurf/frontends/gtk/res/options.gtk3.ui -@@ -2907,68 +2907,17 @@ - - - -- -- Google -- -- -- Yahoo! -- -- -- Microsoft Live -- -- -- Buisiness.com -- -- -- Omgili -- -- -- BBC News -- -- -- Ubuntu Packages -- - - Creative Commons - -- -- Ask -- -- -- Answers -- - - Dictionary.com - -- -- YouTube -- -- -- AeroMP3 -- -- -- AOL -- -- -- Baidu -- -- -- Amazon -- -- -- Ebay -- -- -- IMBD -- -- -- ESPN -- - - Wikipedia - - -- DuckDuckGo -+ DuckDuckGo HTML - - - -diff --git a/netsurf/frontends/riscos/appdir/Resources/SearchEngines b/netsurf/frontends/riscos/appdir/Resources/SearchEngines -index e7fd7cb..f06b66a 100644 ---- a/netsurf/frontends/riscos/appdir/Resources/SearchEngines -+++ b/netsurf/frontends/riscos/appdir/Resources/SearchEngines -@@ -1,22 +1,5 @@ --Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico| --Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico| --Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico| --Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico| --Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://www.omgili.com/favicon.ico| --BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://news.bbc.co.uk/favicon.ico| --Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico| - Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico| --Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://www.ask.com/favicon.ico| --Answers.com|www.answers.com|http://www.answers.com/%s|http://www.answers.com/favicon.ico| - Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico| --Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico| --AeroMp3|www.aeromp3.com|http://www.aeromp3.com/search?q=%s|http://www.aeromp3.com/favicon.ico| --AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico| --Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico| --Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico| --Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico| --IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico| --ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico| - Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico| --DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico| --Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png| -+DuckDuckGo HTML|www.duckduckgo.com/html|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico| -+Seeks|www.seeks.fr|https://www.seeks.fr/search.php/search?q=%s|http://www.seeks.fr/search.php/public/images/seek_icon_32x32_transparent.png| -diff --git a/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf -deleted file mode 120000 -index d3cfb11..0000000 ---- a/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf -+++ /dev/null -@@ -1 +0,0 @@ --../../../../../resources/de/welcome.html -\ No newline at end of file -diff --git a/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf -new file mode 100644 -index 0000000..cdd204a ---- /dev/null -+++ b/netsurf/frontends/riscos/appdir/Resources/de/welcome.html,faf -@@ -0,0 +1,55 @@ -+ -+ -+Welcome to NetSurf -+ -+ -+ -+ -+

NetSurf

-+ -+ -+ -+
-+

Willkommen zu NetSurf

-+ -+

NetSurf ist ein kleiner, schneller Opensource Webbrowser. Wir sind ständig daran interessiert, unseren Browser zu verbessern. Bitte kontaktieren Sie uns, wenn Sie irgend welche Probleme bemerken.
-+Danke, dass Sie sich für NetSurf entschieden haben!

-+ -+
-+
-+ -+ -+
-+
-+ -+
-+
    -+
-+ -+
    -+
-+ -+ -+ -+ -+
-+ -+
-+

NetSurf ist lizensiert unter der GNU Public Licence Version 2

-+
-+
-+ -+ -+ -diff --git a/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf -deleted file mode 120000 -index 71020bf..0000000 ---- a/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf -+++ /dev/null -@@ -1 +0,0 @@ --../../../../../resources/en/welcome.html -\ No newline at end of file -diff --git a/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf -new file mode 100644 -index 0000000..6c146dd ---- /dev/null -+++ b/netsurf/frontends/riscos/appdir/Resources/en/welcome.html,faf -@@ -0,0 +1,54 @@ -+ -+ -+Welcome to NetSurf -+ -+ -+ -+ -+

NetSurf

-+ -+ -+ -+
-+

Welcome to NetSurf

-+ -+

NetSurf is a small, fast open source web browser. We are always keen to improve our browser, so get in touch if you run into any problems. Thanks for choosing NetSurf!

-+ -+
-+
-+ -+ -+
-+
-+ -+
-+
    -+
-+ -+
    -+
-+ -+ -+ -+ -+
-+ -+
-+

NetSurf is licensed under the GNU Public Licence version 2

-+
-+
-+ -+ -+ -\ No newline at end of file -diff --git a/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf -deleted file mode 120000 -index 6e24135..0000000 ---- a/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf -+++ /dev/null -@@ -1 +0,0 @@ --../../../../../resources/it/welcome.html -\ No newline at end of file -diff --git a/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf -new file mode 100644 -index 0000000..1dc24f7 ---- /dev/null -+++ b/netsurf/frontends/riscos/appdir/Resources/it/welcome.html,faf -@@ -0,0 +1,54 @@ -+ -+ -+Benvenuti su NetSurf -+ -+ -+ -+ -+

NetSurf

-+ -+ -+ -+
-+

Benvenuti su NetSurf

-+ -+

NetSurf � la nostra idea di browser, per questo abbiamo scelto di renderlo veloce e sicuro ed ogni giorno lavoriamo per renderlo migliore, se hai qualche suggerimento o semplicemente hai bisogno di aiuto contattaci!

Grazie per aver scelto NetSurf!

-+ -+
-+
-+ -+ -+
-+
-+ -+
-+
    -+
-+ -+
    -+
-+ -+ -+ -+ -+
-+ -+
-+

NetSurf � rilasciato liberamente secondo i termini della Licenza Pubblica Generica GNU 2.0

-+
-+
-+ -+ -+ -diff --git a/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf -deleted file mode 120000 -index 1dfdbd7..0000000 ---- a/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf -+++ /dev/null -@@ -1 +0,0 @@ --../../../../../resources/ja/welcome.html -\ No newline at end of file -diff --git a/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf -new file mode 100644 -index 0000000..925ac38 ---- /dev/null -+++ b/netsurf/frontends/riscos/appdir/Resources/ja/welcome.html,faf -@@ -0,0 +1,55 @@ -+ -+ -+ -+NetSurfへようこそ -+ -+ -+ -+ -+

NetSurf

-+ -+ -+ -+
-+

NetSurfへようこそ

-+ -+

NetSurfは小さくて速いオープンソースのウェブブラウザです。私たちはいつもこのブラウザを改良する気満々ですから、どんな問題でも声をかけてください。NetSurfを選んでくれてありがとう！

-+ -+
-+
-+ -+ -+
-+
-+ -+
-+
    -+
-+ -+
    -+
-+ -+ -+ -+ -+
-+ -+
-+

NetSurfはGNU Public Licence version 2でライセンシングされます。

-+
-+
-+ -+ -+ -diff --git a/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf -deleted file mode 120000 -index 6de5c4a..0000000 ---- a/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf -+++ /dev/null -@@ -1 +0,0 @@ --../../../../../resources/nl/welcome.html -\ No newline at end of file -diff --git a/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf -new file mode 100644 -index 0000000..62dc1bb ---- /dev/null -+++ b/netsurf/frontends/riscos/appdir/Resources/nl/welcome.html,faf -@@ -0,0 +1,66 @@ -+ -+ -+Welkom bij NetSurf -+ -+ -+ -+ -+

NetSurf

-+ -+ -+ -+
-+

Welkom bij NetSurf

-+ -+

NetSurf is een kleine, snelle webbrowser met open broncode. Wij willen altijd onze browser nog beter maken. Neem dus contact op met de ontwikkelaars (in het Engels!) of met de vertalers (gewoon in het Nederlands) mocht je verbeteringsvoorstellen hebben en/of problemen ervaren. Bedankt dat je voor NetSurf hebt gekozen.

-+ -+
-+
-+ -+ -+
-+
-+ -+
-+ -+

Nieuws

-+

-+ -+

RISC OS

-+

-+ -+

Techniek

-+

-+ -+

Zoeken

-+

-+
-+ -+
-+

NetSurf is beschikbaar overeenkomstig GNU Public Licentie, versie 2

-+
-+
-+ -+ -+ -diff --git a/netsurf/resources/SearchEngines b/netsurf/resources/SearchEngines -index 38e7795..c4dd5e2 100644 ---- a/netsurf/resources/SearchEngines -+++ b/netsurf/resources/SearchEngines -@@ -1,20 +1,5 @@ --Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico| --Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico| --Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico| --Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico| --Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://omgili.com/public/images/favicon.ico| --BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://www.bbc.co.uk/favicon.ico| --Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico| - Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico|fixme:favicon does not work as it is served as x-icon and is a png --Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://sp.uk.ask.com/sh/i/a14/favicon/favicon.ico|fixme:favicon is served as text/plain - Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico| --Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico| --AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico| --Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico| --Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico| --Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico| --IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico| --ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico| - Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico| --DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation --Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png|fixme:they have no icon -+DuckDuckGo HTML|www.duckduckgo.com/html|http://www.duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation -+Seeks|www.seeks.fr|https://www.seeks.fr/search.php/search?q=%s|http://www.seeks.fr/search.php/public/images/seek_icon_32x32_transparent.png|fixme:they have no icon diff --git a/nonprism/netsurf/PKGBUILD b/nonprism/netsurf/PKGBUILD new file mode 100644 index 0000000..83cae20 --- /dev/null +++ b/nonprism/netsurf/PKGBUILD @@ -0,0 +1,117 @@ +# Maintainer (arch): Alexander F. Rødseth +# Contributor: Paulo Matias +# Contributor: Georgij Kondratjev +# Contributor: Daniel J Griffiths +# Contributor: André Silva +# Maintainer: Omar Vega Ramos +# Contributor: bill-auger + + +# parabola changes and rationale: +# - remove/replace non-privacy remote services + + +pkgname=netsurf +pkgver=3.11 +pkgrel=1 +pkgrel+=.parabola1 +pkgdesc='Lightweight and fast web browser' +pkgdesc+=', without non-privacy remote services' +arch=(x86_64) +arch+=(armv7h i686) +url='https://www.netsurf-browser.org/' +license=(GPL2 MIT) +depends=(curl gtk3 'libcss>=0.9.2' 'libdom>=0.4.2' 'libhubbub=0.3.8' + libjpeg-turbo 'libnsbmp>=0.1.7' 'libnsgif>=1.0.0' 'libnsutils=0.1.1' + 'libutf8proc>=2.9.0' 'libwapcaplet>=0.4.3' libwebp) +# vim is needed only for xxd when building +makedepends=(check inetutils 'nsgenbind>=0.9' perl-html-parser setconf vim) +source=("https://git.netsurf-browser.org/netsurf.git/snapshot/netsurf-release/$pkgver.tar.bz2" + netsurf.sh) +source+=(remove_nonprivacy_options.patch) +b2sums=('9714735389aa752b5e11a13c3e6e4fc456589517e98fe55025725e05e38a52afea377d53703553ec9d94e492c58f7e1b5ed04c7a0c4fb5158c3053eeedfddcdc' + 'f0220a0c2c03d567434deeed20f821dc110947e16889aa78e12e3f468a431d2f721b9cff23bd6ed3545323f3ed975ea0941f0ee61c4b09938b8bfb99764f8bc8') +b2sums+=('5e0dfb2e3f7fae9a9f346d825480c0cda397444e7ec7e1ae0f41ae0cf31aabff8825ec893cd0e2b940dc21e1599b52454f46e9d53a2b0990f53a7b6ceb382af0') + + +prepare() { + cd $pkgname-release/$pkgver + # Fix compilation issues + sed -i 's:libutf8proc/::;s:UTF8PROC_CCC_VIRAMA:UTF8PROC_BIDI_CLASS_EN:' utils/idna.c + # Use "netsurf" as the name of the executable in /usr/bin + setconf frontends/gtk/res/netsurf-gtk.desktop 'Exec=netsurf %u' + + + ## parabola patching ## + + # remove/replace non-privacy remote services + cd "${srcdir}"/$pkgname-release/$pkgver + echo "applying remove_nonprivacy_options.patch" + patch -p1 -i "${srcdir}"/remove_nonprivacy_options.patch + + # replace search form URL and "quick links" on the welcome page + local welcome_pages=( $(find -name welcome.html) ) + local search_repl=' +' + local links_repl=' +

Quick links:

+
+ + + + + +
' + local search_awk_prog='BEGIN { RS=SUBSEP } { gsub(/
/ , repl) ; } 1' + local links_awk_prog=' BEGIN { RS=SUBSEP } { gsub(/
.*<\/div>/ , repl) ; } 1' + local welcome_page + for welcome_page in ${welcome_pages[*]} + do sed -i '/Download latest NetSurf/d' ${welcome_page} + awk -i inplace -v repl="${search_repl}" "${search_awk_prog}" ${welcome_page} + awk -i inplace -v repl="${links_repl}" "${links_awk_prog}" ${welcome_page} + case "${welcome_page}" in + */en/welcome.html ) sed -i 's|www.wikipedia.org|en.wikipedia.org|' ${welcome_page} ;; + */de/welcome.html ) sed -i 's|www.wikipedia.org|de.wikipedia.org|' ${welcome_page} ;; + */it/welcome.html ) sed -i 's|www.wikipedia.org|it.wikipedia.org|' ${welcome_page} ;; + */ja/welcome.html ) sed -i 's|www.wikipedia.org|ja.wikipedia.org|' ${welcome_page} ;; + */nl/welcome.html ) sed -i 's|www.wikipedia.org|nl.wikipedia.org|' ${welcome_page} ;; + */zh_CN/welcome.html) sed -i 's|www.wikipedia.org|zh.wikipedia.org|' ${welcome_page} ;; + esac + done + + # patching checks + local err_msg="ERROR: search engines patching needs re-working" + ! grep -i google ${welcome_pages[*]} || ! echo "$err_msg" || return 1 +} + +build() { + export CFLAGS+=' -Os -funroll-loops -w' + make -C $pkgname-release/$pkgver INCLUDEDIR=include LIBDIR=lib \ + NETSURF_UA_FORMAT_STRING='"Mozilla/5.0 (Arch Linux; %s) NetSurf/%d.%d"' \ + PREFIX=/usr TARGET=gtk3 +} + +package() { + make -C $pkgname-release/$pkgver DESTDIR="$pkgdir" INCLUDEDIR=include LIBDIR=lib PREFIX=/usr TARGET=gtk3 install + install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname" + cd $pkgname-release/$pkgver + install -Dm644 frontends/gtk/res/$pkgname.xpm "$pkgdir/usr/share/pixmaps/$pkgname.xpm" + install -Dm644 frontends/gtk/res/$pkgname-gtk.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/nonprism/netsurf/netsurf.sh b/nonprism/netsurf/netsurf.sh new file mode 100644 index 0000000..1a153a5 --- /dev/null +++ b/nonprism/netsurf/netsurf.sh @@ -0,0 +1,4 @@ +#!/bin/bash +# Use English if a directory for the current language does not exist +test -d "/usr/share/netsurf/${LANG:0:2}" || export LANG=en_US.UTF-8 +/usr/bin/netsurf-gtk3 "$@" diff --git a/nonprism/netsurf/remove_nonprivacy_options.patch b/nonprism/netsurf/remove_nonprivacy_options.patch new file mode 100644 index 0000000..9509a16 --- /dev/null +++ b/nonprism/netsurf/remove_nonprivacy_options.patch @@ -0,0 +1,172 @@ +diff --git a/desktop/searchweb.c b/desktop/searchweb.c +index 2c0873d..6efdf62 100644 +--- a/desktop/searchweb.c ++++ b/desktop/searchweb.c +@@ -35,9 +35,9 @@ + #include "desktop/gui_internal.h" + + struct search_provider { +- char *name; /**< readable name such as 'google', 'yahoo', etc */ +- char *hostname; /**< host address such as www.google.com */ +- char *searchstring; /** < such as "www.google.com?search=%s" */ ++ char *name; /**< readable name such as 'duckduckgo', 'wikipedia', etc */ ++ char *hostname; /**< host address such as html.duckduckgo.com/html */ ++ char *searchstring; /** < such as "html.duckduckgo.com/html/?q=%s" */ + char *ico; /** < location of domain's favicon */ + hlcache_handle *ico_handle; + }; +@@ -53,7 +53,7 @@ static struct search_web_ctx_s { + } search_web_ctx; + + +-static const char *default_providers = "Google|www.google.com|https://www.google.com/search?q=%s|https://www.google.com/favicon.ico|\n"; ++static const char *default_providers = "DuckDuckGo|www.duckduckgo.com|https://duckduckgo.com/html/?q=%s|https://www.duckduckgo.com/favicon.ico|\n"; + + static const char *default_search_icon_url = "resource:icons/search.png"; + +diff --git a/frontends/amiga/dist/NetSurf.guide b/frontends/amiga/dist/NetSurf.guide +index 0bdd900..e2be43c 100755 +--- a/frontends/amiga/dist/NetSurf.guide ++++ b/frontends/amiga/dist/NetSurf.guide +@@ -308,13 +308,13 @@ eg. + | + +- -- + | +- +- Google ++ +- DuckDuckGo HTML + + Will look something like the following within the menu: + + |NetSurf �| - |NetSurf Homepage | + |---------| |More NetSurf links| +-|Google | ++|DuckDuckGo HTML | + + @endnode + +diff --git a/frontends/gtk/res/gtk3/options.ui b/frontends/gtk/res/gtk3/options.ui +index 907d0b5..a2de65c 100644 +--- a/frontends/gtk/res/gtk3/options.ui ++++ b/frontends/gtk/res/gtk3/options.ui +@@ -2907,68 +2907,17 @@ + + + +- +- Google +- +- +- Yahoo! +- +- +- Microsoft Live +- +- +- Buisiness.com +- +- +- Omgili +- +- +- BBC News +- +- +- Ubuntu Packages +- + + Creative Commons + +- +- Ask +- +- +- Answers +- + + Dictionary.com + +- +- YouTube +- +- +- AeroMP3 +- +- +- AOL +- +- +- Baidu +- +- +- Amazon +- +- +- Ebay +- +- +- IMBD +- +- +- ESPN +- + + Wikipedia + + +- DuckDuckGo ++ DuckDuckGo HTML + + + +diff --git a/frontends/riscos/appdir/Resources/SearchEngines b/frontends/riscos/appdir/Resources/SearchEngines +index e7fd7cb..f06b66a 100644 +--- a/frontends/riscos/appdir/Resources/SearchEngines ++++ b/frontends/riscos/appdir/Resources/SearchEngines +@@ -1,21 +1,5 @@ +-Google|www.google.com|https://www.google.com/search?q=%s|https://www.google.com/favicon.ico| +-Yahoo|search.yahoo.com|https://search.yahoo.com/search?p=%s|https://www.yahoo.com/favicon.ico| +-Bing|www.bing.com|https://www.bing.com/search?q=%s|https://www.bing.com/favicon.ico| +-Business.com|www.business.com|https://www.business.com/search/rslt_default.asp?query=%s|https://www.business.com/favicon.ico| +-Omgili|www.omgili.com|https://www.omgili.com/AAAAA/%s.html|https://www.omgili.com/favicon.ico| +-BBC News|search.bbc.co.uk|https://search.bbc.co.uk/search?q=%s&tab=ns|https://news.bbc.co.uk/favicon.ico| +-Ubuntu Packages|packages.ubuntu.com|https://packages.ubuntu.com/search?keywords=%s|https://packages.ubuntu.com/favicon.ico| + Creative Commons|creativecommons.org|https://creativecommons.org/?s=%s|https://creativecommons.org/favicon.ico| +-Ask.com|www.ask.com|https://www.ask.com/web?q=%s|https://www.ask.com/favicon.ico| +-Answers.com|www.answers.com|https://www.answers.com/%s|https://www.answers.com/favicon.ico| + Dictionary.com|dictionary.reference.com|https://dictionary.reference.com/browse/%s?jss=0|https://dictionary.reference.com/favicon.ico| +-Youtube|www.youtube.com|https://www.youtube.com/results?search_query=%s|https://www.youtube.com/favicon.ico| +-AeroMp3|www.aeromp3.com|https://www.aeromp3.com/search?q=%s|https://www.aeromp3.com/favicon.ico| +-AOL|search.aol.com|https://search.aol.com/aol/search?query=%s|https://www.aol.com/favicon.ico| +-Baidu|www.baidu.com|https://www.baidu.com/s?wd=%s|https://www.baidu.com/favicon.ico| +-Amazon|www.amazon.com|https://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|https://www.amazon.com/favicon.ico| +-Ebay|shop.ebay.com|https://shop.ebay.com/items/%s|https://www.ebay.com/favicon.ico| +-IMDB|www.imdb.com|https://www.imdb.com/find?q=%s|https://www.imdb.com/favicon.ico| +-ESPN|search.espn.go.com|https://search.espn.go.com/%s/|https://www.espn.go.com/favicon.ico| + Wikipedia|en.wikipedia.org|https://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|https://en.wikipedia.org/favicon.ico| + DuckDuckGo|www.duckduckgo.com|https://www.duckduckgo.com/?q=%s|https://www.duckduckgo.com/favicon.ico| ++DuckDuckGo HTML|html.duckduckgo.com/html|https://www.duckduckgo.com/?q=%s|https://www.duckduckgo.com/favicon.ico| +diff --git a/resources/SearchEngines b/resources/SearchEngines +index 38e7795..c4dd5e2 100644 +--- a/resources/SearchEngines ++++ b/resources/SearchEngines +@@ -1,19 +1,5 @@ +-Google|www.google.com|https://www.google.com/search?q=%s|https://www.google.com/favicon.ico| +-Yahoo|search.yahoo.com|https://search.yahoo.com/search?p=%s|https://www.yahoo.com/favicon.ico| +-Bing|www.bing.com|https://www.bing.com/search?q=%s|https://www.bing.com/favicon.ico| +-Business.com|www.business.com|https://www.business.com/search/rslt_default.asp?query=%s|https://www.business.com/favicon.ico| +-Omgili|www.omgili.com|https://www.omgili.com/AAAAA/%s.html|https://omgili.com/public/images/favicon.ico| +-BBC News|search.bbc.co.uk|https://search.bbc.co.uk/search?q=%s&tab=ns|https://www.bbc.co.uk/favicon.ico| +-Ubuntu Packages|packages.ubuntu.com|https://packages.ubuntu.com/search?keywords=%s|https://packages.ubuntu.com/favicon.ico| + Creative Commons|creativecommons.org|https://creativecommons.org/?s=%s|https://creativecommons.org/favicon.ico|fixme:favicon does not work as it is served as x-icon and is a png +-Ask.com|www.ask.com|https://www.ask.com/web?q=%s|https://sp.uk.ask.com/sh/i/a14/favicon/favicon.ico|fixme:favicon is served as text/plain + Dictionary.com|dictionary.reference.com|https://dictionary.reference.com/browse/%s?jss=0|https://dictionary.reference.com/favicon.ico| +-Youtube|www.youtube.com|https://www.youtube.com/results?search_query=%s|https://www.youtube.com/favicon.ico| +-AOL|search.aol.com|https://search.aol.com/aol/search?query=%s|https://www.aol.com/favicon.ico| +-Baidu|www.baidu.com|https://www.baidu.com/s?wd=%s|https://www.baidu.com/favicon.ico| +-Amazon|www.amazon.com|https://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|https://www.amazon.com/favicon.ico| +-Ebay|shop.ebay.com|https://shop.ebay.com/items/%s|https://www.ebay.com/favicon.ico| +-IMDB|www.imdb.com|https://www.imdb.com/find?q=%s|https://www.imdb.com/favicon.ico| +-ESPN|search.espn.go.com|https://search.espn.go.com/%s/|https://www.espn.go.com/favicon.ico| + Wikipedia|en.wikipedia.org|https://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|https://en.wikipedia.org/favicon.ico| + DuckDuckGo|www.duckduckgo.com|https://html.duckduckgo.com/html/?q=%s|https://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation ++DuckDuckGo HTML|html.duckduckgo.com/html|https://html.duckduckgo.com/html/?q=%s|https://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation From 1c678f849334a1ef4bbf70f9868331ad2cb04f27 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 10 2024 23:18:38 +0000 Subject: [PATCH 55/73] housekeeping --- diff --git a/libre/qt5-webkit/PKGBUILD b/libre/qt5-webkit/PKGBUILD index ba5b201..19be1ce 100644 --- a/libre/qt5-webkit/PKGBUILD +++ b/libre/qt5-webkit/PKGBUILD @@ -4,6 +4,7 @@ # Contributor: Antonio Rojas # Contributor: Andrea Scarpino # Maintainer: Parabola Hackers +# Contributor: bill-auger # parabola changes and rationale: From 5232d553e13f643f82052642e5c3b08fb676df86 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 10 2024 23:19:03 +0000 Subject: [PATCH 56/73] pacman-mirrorlist: update checksum --- diff --git a/libre/pacman-mirrorlist/PKGBUILD b/libre/pacman-mirrorlist/PKGBUILD index 74b16af..3a58061 100644 --- a/libre/pacman-mirrorlist/PKGBUILD +++ b/libre/pacman-mirrorlist/PKGBUILD @@ -27,7 +27,7 @@ license=(GPL) backup=(etc/pacman.d/mirrorlist) source=(mirrorlist-${pkgver}.txt::https://repo.parabola.nu/mirrorlist.txt) -sha256sums=('2677d42da3bebb12b2b26cb1ea7f42efdc80db6bc3e3d483dd202acb2c1e443a') +sha256sums=('d82f8f4f60f555ac54d4f81bceed84ebc9c1ec02d22daae2eace1be20a41b9a4') prepare() From 7daecdcb9213a9c95bc8b9c43c4bfab6e22c7bf2 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 10 2024 23:19:16 +0000 Subject: [PATCH 57/73] icewweasel: upgrade to v121.0.1 --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 575bc74..3ea7e58 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,7 +70,7 @@ pkgname=iceweasel epoch=1 -pkgver=121.0 +pkgver=121.0.1 pkgrel=1 pkgrel+=.parabola1 _brandingver=120.0 @@ -162,7 +162,6 @@ source+=( 9004-FSDG-misc.patch process-json-files.py vendor.js.in - zstandard-0.22.0.diff ) source_i686=( avoid-libxul-OOM-python-check.patch @@ -181,7 +180,7 @@ validpgpkeys+=( '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger ) -sha256sums=('edc7a5159d23ff2a23e22bf5abe22231658cee2902b93b5889ee73958aa06aa4' +sha256sums=('b3a4216e01eaeb9a7c6ef4659d8dcd956fbd90a78a8279ee3a598881e63e49ce' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') # $pkgname.desktop # identity-icons-brand.svg @@ -192,14 +191,13 @@ sha256sums+=('a5eed3c1f31a253f90b0284e0caf17bd35b3fa35197cfc403cb1bd987ecd56eb' '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62' # 9003-FSDG-urihandlers.patch 'f999ddb5a2cde87217bb5b0ebf20b4e0aabe88657a73545c9487cddde1deab22' # 9004-FSDG-misc.patch '5f3a646d90a075458b4cb27c19ddbd50ae7717f4e3371c9e2e4de1a8e718553e' # process-json-files.py - '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06' # vendor.js.in - '3803336b109ab3663d227d6d16f712c33f5c55712028ee74e6e82f2ef74bf55f') # zstandard-0.22.0.diff + '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06') # vendor.js.in sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1c0' # avoid-libxul-OOM-python-check.patch 'b25d9fb901afc5447bcd87416741f705eb7188502e10097387d5b0c86417fd01' # rust-static-disable-network-test-on-static-libraries.patch 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch -b2sums=('80905caeb208ef5dce7b62e248c86598ca786eb7032e114ad5d10812623bfceb688832f646dfbe220ef2fcecacf11cefae2afb0f1cdc0f7952647b71c58c9602' +b2sums=('c9931d38bb9c612000409ed54b2fbb190cabcb714cd559152f2f645a8a3a82934874d31e40fc298dca765dac94e4e0927b125e14cee325484ba0f9b1ed2cdc55' 'SKIP' 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635') # $pkgname.desktop # identity-icons-brand.svg @@ -359,10 +357,6 @@ prepare() { ## technical patching ## - # Unbreak build with python-zstandard 0.22.0 - echo "applying zstandard-0.22.0.diff" - patch -Np1 -i ../zstandard-0.22.0.diff - # Use system python-typing-extensions instead of the old vendored one to avoid # unresolvable dependency versions. They are probably downloaded when network # connectivity is enabled at built time, but that is not the case for Parabola. diff --git a/libre/iceweasel/zstandard-0.22.0.diff b/libre/iceweasel/zstandard-0.22.0.diff deleted file mode 100644 index ed3083d..0000000 --- a/libre/iceweasel/zstandard-0.22.0.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/python/sites/mach.txt b/python/sites/mach.txt -index d105723399..b10a7e42d7 100644 ---- a/python/sites/mach.txt -+++ b/python/sites/mach.txt -@@ -143,4 +143,4 @@ pypi-optional:glean-sdk==52.7.0:telemetry will not be collected - # We aren't (yet) able to pin packages in automation, so we have to - # support down to the oldest locally-installed version (5.4.2). - pypi-optional:psutil>=5.4.2,<=5.9.4:telemetry will be missing some data --pypi-optional:zstandard>=0.11.1,<=0.19.0:zstd archives will not be possible to extract -+pypi-optional:zstandard>=0.11.1,<=0.22.0:zstd archives will not be possible to extract From 4f84a283b96fa887c6d6ee7077139675dd2baec7 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 11 2024 23:38:33 +0000 Subject: [PATCH 58/73] systemd: WIP - upgrade to v255.2 --- diff --git a/libre/systemd/30-systemd-daemon-reload-system.hook b/libre/systemd/30-systemd-daemon-reload-system.hook new file mode 100644 index 0000000..a305d73 --- /dev/null +++ b/libre/systemd/30-systemd-daemon-reload-system.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/systemd/system/* + +[Action] +Description = Reloading system manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-system diff --git a/libre/systemd/30-systemd-daemon-reload-user.hook b/libre/systemd/30-systemd-daemon-reload-user.hook new file mode 100644 index 0000000..3eddf8f --- /dev/null +++ b/libre/systemd/30-systemd-daemon-reload-user.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/systemd/user/* + +[Action] +Description = Reloading user manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-user diff --git a/libre/systemd/30-systemd-daemon-reload.hook b/libre/systemd/30-systemd-daemon-reload.hook deleted file mode 100644 index dff95e4..0000000 --- a/libre/systemd/30-systemd-daemon-reload.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/systemd/system/* - -[Action] -Description = Reloading system manager configuration... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload diff --git a/libre/systemd/30-systemd-hwdb.hook b/libre/systemd/30-systemd-hwdb.hook index 1b855cf..1d85e29 100644 --- a/libre/systemd/30-systemd-hwdb.hook +++ b/libre/systemd/30-systemd-hwdb.hook @@ -8,4 +8,4 @@ Target = usr/lib/udev/hwdb.d/* [Action] Description = Updating udev hardware database... When = PostTransaction -Exec = /usr/share/libalpm/scripts/udev-hook hwdb +Exec = /usr/share/libalpm/scripts/systemd-hook hwdb diff --git a/libre/systemd/30-systemd-udev-reload.hook b/libre/systemd/30-systemd-udev-reload.hook index 96e81df..7676cca 100644 --- a/libre/systemd/30-systemd-udev-reload.hook +++ b/libre/systemd/30-systemd-udev-reload.hook @@ -8,4 +8,4 @@ Target = usr/lib/udev/rules.d/* [Action] Description = Reloading device manager configuration... When = PostTransaction -Exec = /usr/share/libalpm/scripts/udev-hook udev-reload +Exec = /usr/share/libalpm/scripts/systemd-hook udev-reload diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index dddff10..6200785 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -2,20 +2,42 @@ # Maintainer: Luke Shumaker # Contributor: Omar Vega Ramos # Contributor: Denis 'GNUtoo' Carikli +# Contributor: bill-auger + + +# parabola changes and rationale: +# - split arch's 'systemd-libs' into "systemd-$X", for the following $X: +# libsystemd libudev nss-systemd nss-myhostname nss-mymachines nss-resolve +# this helps parabola to support "init-freedom" +# parabola's 'systemd-libs' is a meta-package, collecting those split-packages + + +# NOTE: this is a WIP toward v255 - it may not be correct, and may not even compile +# TODO: see the many 'TODO:' sprinkled about + pkgbase=systemd -pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat') -pkgname+=('systemd-common' 'systemd-udev') -# We split Arch's systemd-libs into systemd-$X, for the following $X: -_systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') -pkgname+=("${_systemd_libs[@]/#/systemd-}") -_tag='eb0f8fc41511dda1f9e0d19e830cc8c6668a2628' # git rev-parse v${_tag_name} -_tag_name=253 +pkgname=('systemd' + 'systemd-libs' + 'systemd-resolvconf' + 'systemd-sysvcompat' + 'systemd-ukify') +_systemd_libs=('libsystemd' + 'libudev' + 'nss-systemd' + 'nss-myhostname' + 'nss-mymachines' + 'nss-resolve') +pkgname+=('systemd-common' + 'systemd-udev' + ${_systemd_libs[*]/#/systemd-}) +_tag='be88ad03366b8aa059bb72b39a270128ba62b428' # git rev-parse v${_tag_name} +_tag_name=255.2 pkgver="${_tag_name/-/}" -pkgrel=1 -pkgrel+=.parabola2 +pkgrel=2 +pkgrel+=.parabola1 arch=('x86_64') -arch+=('i686' 'armv7h' 'ppc64le') +arch+=('armv7h' 'i686' 'ppc64le') url='https://www.github.com/systemd/systemd' makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt' @@ -23,7 +45,8 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'git' 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon' 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync' - 'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls') + 'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools' + 'libpwquality' 'qrencode' 'lib32-gcc-libs') makedepends_i686=('gnu-efi-libs' 'pkgconf') makedepends_x86_64=('gnu-efi-libs') options=('strip') @@ -34,59 +57,63 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering < source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed" '0001-Use-Arch-Linux-device-access-groups.patch' + # mkinitcpio files 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' + # bootloader files 'parabola.conf' 'loader.conf' 'splash-parabola.bmp' + # pam configuration 'systemd-user.pam' + # pacman / libalpm hooks 'systemd-hook' '20-systemd-sysusers.hook' - 'udev-hook' '30-systemd-binfmt.hook' '30-systemd-catalog.hook' - '30-systemd-daemon-reload.hook' + '30-systemd-daemon-reload-system.hook' + '30-systemd-daemon-reload-user.hook' '30-systemd-hwdb.hook' '30-systemd-sysctl.hook' '30-systemd-tmpfiles.hook' '30-systemd-udev-reload.hook' - '30-systemd-update.hook' - '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' - '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch' - '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch' - '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch' - '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch' - '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch' - '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch') + '30-systemd-update.hook') +source+=('0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' + '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch' + '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch' + '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch' + '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch' + '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch' + '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch') sha512sums=('SKIP' 'SKIP' '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e' - 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - 'c6c30042b9f11c04e4430a4f45cce09c2dcc706bac567d7f8ec93b92ef791cd726d81c5b7d5468b350377f6338fa24d39c1ee8f4e8ce5826a61f4a9d4de4b25b' + '4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e' + 'ada692514d758fa11e2be6b4c5e1dc2d9d47548f24ada35afdce1dcac918e72ae2251c892773e6cf41fa431c3613a1608668e999eb86a565870fecb55c47b4ba' 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6' - '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8' - '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9' - 'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c' + '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8' # 'parabola.conf' - should differ from arch + 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' + 'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c' # 'splash-parabola.bmp' - should differ from arch 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' - 'f47638f4f0c154b7833a055b78b6dad14f17be43af0279f65d26e34926a80263bcec33eeda03debd72cdd2b9b0ef23d91f1a7e5ab2915936046c3231e97e3acb' + '3cb8f88c1bffc753d0c540be5d25a0fdb9224478cca64743b5663340f2f26b197775286e6e680228db54c614dcd11da1135e625674a622127681662bec4fa886' '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5' - '528bbf114ca4fc02a2cfc0d684c43859e79aa8b1ea5c4145b74848849b5644cbf44500c57751e75a250f4d53b46249efce18ca1190e03c3d06f0a2750ce19698' '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7' '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc' - '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254' - 'cee9240dac5888d1dde916429ac25c022e30b5d7c53ba9e699e281021d2224bfd6e4cc4ac1c71c15f768b720d524cac0dabaae06d026a68759f6fe84b4c62751' + 'a436d3f5126c6c0d6b58c6865e7bd38dbfbfb7babe017eeecb5e9d162c21902cbf4e0a68cf3ac2f99815106f9fa003b075bd2b4eb5d16333fa913df6e2f3e32a' + '190112e38d5a5c0ca91b89cd58f95595262a551530a16546e1d84700fc9644aa2ca677953ffff655261e8a7bff6e6af4e431424df5f13c00bc90b77c421bc32d' + 'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154' '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de' 'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc' - '5aa475f37d35752a95e73417c38c4d3bc4d15d5f1052e95d75b4c4144b74c79af94da1d1e954be536339f9829a1ceb3a1bc5c6adceb187df7a8e5f5a83e4a850' - '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97' - 'a277bef64318f91747b8b9c74282e6f346690712ed7296d102688173409f7987673619fb44f3c6609bd38781d382871f56a89be771279e610a5437520183c9b9' - '21e30bedbfa326af04dc73d0281d01d069b6287b45dbb49b7b93d1bceb6c030532e1739b83ed425c20d0deba0a824f0f3147d1e8c3d26206c8edc541e3fc32b6' - '730014c3ce5e9526075569641efadec6acf75df5a88e26b83420b130399f3ba8b6a23d778e7221abe8bfd9e54457562905fa068911be5078ac3cd993dad468a5' - 'f24191e6331b58dc4f1c1b7b28b854ba94c6de53b2dc97e5721c208abe7543efab4b8519013bdb02ebeb5058dd5c56a8318bf99a972772de188b40861c88e349' - 'c6a8a56c54415a266dcb57cc24fd91d085ca7298aca6b522e626f41ed216b13c9695ff4d209f7e60d24fb5e65e40ef5151c8d95db6950eda8a4150d28fcd56be' - '347d5c7b7e809191588e97638b2792edb40cec6c20f1983920f0a66b0acc7ef77d30c6d45f730c0e70b2af0f9851d16d2c1838a52b0d9b6b3344be3c8815f823' - '9786edfa655c7400aba362f5fabb93df33e23dfb86e9820585943467f4918937f30e4d9daa74538321a288c2611dda95b700efae14719d34dac6d79eab537a60') + 'a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3' + '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97') +sha512sums+=('a277bef64318f91747b8b9c74282e6f346690712ed7296d102688173409f7987673619fb44f3c6609bd38781d382871f56a89be771279e610a5437520183c9b9' + '21e30bedbfa326af04dc73d0281d01d069b6287b45dbb49b7b93d1bceb6c030532e1739b83ed425c20d0deba0a824f0f3147d1e8c3d26206c8edc541e3fc32b6' + '730014c3ce5e9526075569641efadec6acf75df5a88e26b83420b130399f3ba8b6a23d778e7221abe8bfd9e54457562905fa068911be5078ac3cd993dad468a5' + 'f24191e6331b58dc4f1c1b7b28b854ba94c6de53b2dc97e5721c208abe7543efab4b8519013bdb02ebeb5058dd5c56a8318bf99a972772de188b40861c88e349' + 'c6a8a56c54415a266dcb57cc24fd91d085ca7298aca6b522e626f41ed216b13c9695ff4d209f7e60d24fb5e65e40ef5151c8d95db6950eda8a4150d28fcd56be' + '347d5c7b7e809191588e97638b2792edb40cec6c20f1983920f0a66b0acc7ef77d30c6d45f730c0e70b2af0f9851d16d2c1838a52b0d9b6b3344be3c8815f823' + '9786edfa655c7400aba362f5fabb93df33e23dfb86e9820585943467f4918937f30e4d9daa74538321a288c2611dda95b700efae14719d34dac6d79eab537a60') _backports=( ) @@ -100,26 +127,27 @@ prepare() { # add upstream repository for cherry-picking git remote add -f upstream ../systemd - local _c + local _c _l for _c in "${_backports[@]}"; do - if [[ $_c == *..* ]]; then - git log --oneline --reverse "${_c}" - else - git log --oneline -1 "${_c}" - fi - git cherry-pick -n -m1 "${_c}" + if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi + git log --oneline "${_l}" "${_c}" + git cherry-pick --mainline 1 --no-commit "${_c}" done for _c in "${_reverts[@]}"; do - git log --oneline -1 "${_c}" - git revert -n "${_c}" + if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi + git log --oneline "${_l}" "${_c}" + git revert --mainline 1 --no-commit "${_c}" done # Replace cdrom/dialout/tape groups with optical/uucp/storage patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch - # apply FSDG patches + + ## parabola patching ## + local _patch for _patch in "$srcdir"/????-FSDG-*.patch; do + echo "applying $_patch" patch -Np1 -i "$_patch" done } @@ -149,14 +177,19 @@ build() { # internal version comparison is incompatible with pacman: # 249~rc1 < 249 < 249.1 < 249rc -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-parabola" -# -Dshared-lib-tag="${pkgver}-${pkgrel}" + -Dshared-lib-tag="${pkgver}-${pkgrel}" -Dmode=release + -Dapparmor=false + -Dbootloader=true + -Dxenctrl=false -Dbpf-framework=true -Dima=false -Dlibidn2=true -Dlz4=true -Dman=true + -Dnscd=false + -Dselinux=false # We disable DNSSEC by default, it still causes trouble: # https://github.com/systemd/systemd/issues/10579 @@ -186,6 +219,10 @@ build() { _meson_options+=(-Dgnu-efi=true) fi + # this uses malloc_usable_size, which is incompatible with fortification level 3 + export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" + arch-meson "$pkgbase-stable" build "${_meson_options[@]}" meson compile -C build @@ -197,29 +234,33 @@ build() { # Put things in the main systemd package by default meson install -C build --destdir "$srcdir/dest/systemd" + # systemd-common install -dm755 "$srcdir/dest/common"/usr/lib/systemd mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/libsystemd-shared-${pkgver%%.*}.so + # systemd-udev + install -dm755 "$srcdir/dest/udev"/{etc,usr/lib} + mv -T "$srcdir/dest"/{systemd,udev}/etc/udev/ + mv -T "$srcdir/dest"/{systemd,udev}/usr/lib/udev/ + while read -d '' -r file; do + install -dm755 "$srcdir/dest/udev/${file%/*}" + mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file" + done < <(find "$srcdir/dest/systemd" \( -name '*udev*' -o -name '*hwdb*' \) -printf '%P\0') + + # systemd-libsystemd install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include} mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/lib/pkgconfig/libsystemd.pc mv "$srcdir/dest"/systemd/usr/lib/libsystemd.so* -t "$srcdir/dest"/libsystemd/usr/lib/ mv "$srcdir/dest"/systemd/usr/share/man/man3/{SD,sd}* -t "$srcdir/dest"/libsystemd/usr/share/man/man3/ + # systemd-libudev install -dm755 "$srcdir/dest/libudev"/usr/{lib/pkgconfig,share/man/man3,include} mv -T "$srcdir/dest"/{systemd,libudev}/usr/include/libudev.h mv -T "$srcdir/dest"/{systemd,libudev}/usr/lib/pkgconfig/libudev.pc mv "$srcdir/dest"/systemd/usr/lib/libudev.so* -t "$srcdir/dest"/libudev/usr/lib/ mv "$srcdir/dest"/systemd/usr/share/man/man3/*udev* -t "$srcdir/dest"/libudev/usr/share/man/man3/ - install -dm755 "$srcdir/dest/udev"/{etc,usr/lib} - mv -T "$srcdir/dest"/{systemd,udev}/etc/udev/ - mv -T "$srcdir/dest"/{systemd,udev}/usr/lib/udev/ - while read -d '' -r file; do - install -dm755 "$srcdir/dest/udev/${file%/*}" - mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file" - done < <(find "$srcdir/dest/systemd" \( -name '*udev*' -o -name '*hwdb*' \) -printf '%P\0') - local nssmodule for nssmodule in systemd myhostname mymachines resolve; do install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8} @@ -229,6 +270,7 @@ build() { mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/ done + # systemd-sysvcompat install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8 mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 \ -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8 @@ -256,7 +298,9 @@ check() { package_systemd() { pkgdesc='system and service manager' - license=('LGPL2.1') +# TODO: quite a mess to untangle here + license=('GPL2' 'LGPL2.1') + license=('LGPL2.1') # TODO: what is the license? depends=('bash' 'dbus' 'dbus-units' 'kbd' 'kmod' 'libkmod.so' 'systemd-libs' 'pam' 'libelf' 'util-linux' 'pcre2') @@ -264,14 +308,17 @@ package_systemd() { provides=("systemd-tools=$pkgver") replaces=('systemd-tools') conflicts=('systemd-tools') - optdepends=('libmicrohttpd: remote journald capabilities' + optdepends=('libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote' 'quota-tools: kernel-level quota management' 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'systemd-ukify: combine kernel and initrd into a signed Unified Kernel Image' 'polkit: allow administration as unprivileged user' - 'python: Unified Kernel Image with ukify' - 'curl: machinectl pull-tar and pull-raw' + 'curl: systemd-journal-upload, machinectl pull-tar and pull-raw' 'gnutls: systemd-journal-gatewayd and systemd-journal-remote' + 'qrencode: show QR codes' + 'iptables: firewall features' 'libbpf: support BPF programs' + 'libpwquality: check password quality' 'libfido2: unlocking LUKS2 volumes with FIDO2 token' 'libp11-kit: support PKCS#11' 'tpm2-tss: unlocking LUKS2 volumes with TPM2') @@ -289,7 +336,11 @@ package_systemd() { etc/systemd/sleep.conf etc/systemd/system.conf etc/systemd/timesyncd.conf - etc/systemd/user.conf) + etc/systemd/user.conf + etc/udev/iocost.conf + etc/udev/udev.conf) + backup=( ${backup[*]/etc\/udev\/udev.conf/} ) # 'systemd-udev' owns this + install=systemd.install cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" @@ -297,6 +348,8 @@ package_systemd() { # we'll create this on installation rmdir "$pkgdir"/var/log/journal/remote + # TODO: apply these moves from arch PKGBUILD or not? + # executable (symlinks) shipped with systemd-sysvcompat rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,shutdown} @@ -313,6 +366,8 @@ package_systemd() { # add mkinitcpio hooks install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd + install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev + install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev # The group 'systemd-journal' is allocated dynamically and may have varying # gid on different systems. Let's install with gid 0 (root), systemd-tmpfiles @@ -330,12 +385,74 @@ package_systemd() { # pacman hooks install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook - rm -- "$pkgdir"/usr/share/libalpm/hooks/*{udev,hwdb}* + rm -- "$pkgdir"/usr/share/libalpm/hooks/*{udev,hwdb}* # TODO: delete these, or not? # overwrite the systemd-user PAM configuration with our own install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user } +package_systemd-libs() { + pkgdesc='systemd client libraries' + pkgdesc+=' meta-package' + depends=("${_systemd_libs[@]}") + license=('LGPL2.1') + provides=('libsystemd') # TODO: apply the arch sodeps in this package? or which? + conflicts=('libsystemd') + replaces=('libsystemd') + + # TODO: apply these moves from arch PKGBUILD or not? +} + +package_systemd-resolvconf() { + pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)' + license=('LGPL2.1') + depends=('systemd') + provides=('openresolv' 'resolvconf') + conflicts=('resolvconf') + + install -d -m0755 "$pkgdir"/usr/bin + ln -s resolvectl "$pkgdir"/usr/bin/resolvconf + + install -d -m0755 "$pkgdir"/usr/share/man/man1 + ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz +} + +package_systemd-sysvcompat() { + pkgdesc='sysvinit compat for systemd' + license=('GPL2') + license=('LGPL2.1') # TODO: what is the license? + conflicts=('sysvinit') + conflicts+=('init') # init-freedom + provides=('init') # init-freedom + depends=('systemd') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" + + install -d -m0755 "$pkgdir"/usr/bin + ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init + for tool in halt poweroff reboot shutdown; do + ln -s systemctl "$pkgdir"/usr/bin/$tool + done +} + +package_systemd-ukify() { + pkgdesc='Combine kernel and initrd into a signed Unified Kernel Image' + license=('GPL2') + provides=('ukify') + depends=('binutils' 'python-cryptography' 'python-pefile' 'systemd') + optdepends=('python-pillow: Show the size of splash image' + 'sbsigntools: Sign the embedded kernel') + + install -d -m0755 "$pkgdir"/usr/{lib/kernel,share/man} + mv systemd-ukify/bin "$pkgdir"/usr/bin + mv systemd-ukify/systemd "$pkgdir"/usr/lib/systemd + mv systemd-ukify/man1 "$pkgdir"/usr/share/man/man1 + mv systemd-ukify/install.d "$pkgdir"/usr/lib/kernel/install.d +} + + +## parabola split-packages ## + package_systemd-common() { pkgdesc='systemd files shared between split packages' license=('LGPL2.1') @@ -370,15 +487,6 @@ package_systemd-udev() { install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook } -package_systemd-libs() { - pkgdesc='systemd client libraries metapackage' - depends=("${_systemd_libs[@]}") - license=('LGPL2.1') - provides=('libsystemd') - conflicts=('libsystemd') - replaces=('libsystemd') -} - package_systemd-libsystemd() { pkgdesc='systemd client library' depends=('glibc' 'gcc-libs' 'libcap' 'libcap.so' 'libgcrypt' 'lz4' 'xz' 'zstd') @@ -452,37 +560,3 @@ package_systemd-nss-resolve() { cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" } - -package_systemd-resolvconf() { - pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)' - license=('LGPL2.1') - depends=('systemd') - provides=('openresolv' 'resolvconf') - conflicts=('openresolv') - - replaces+=('notsystemd-resolvconf') # notsystemd-resolvconf should have never existed - - install -d -m0755 "$pkgdir"/usr/bin - ln -s resolvectl "$pkgdir"/usr/bin/resolvconf - - install -d -m0755 "$pkgdir"/usr/share/man/man1 - ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz -} - -package_systemd-sysvcompat() { - pkgdesc='sysvinit compat for systemd' - license=('LGPL2.1') - provides=('init') - conflicts=('init' 'sysvinit') - depends=('systemd') - - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" - - install -d -m0755 "$pkgdir"/usr/bin - ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init - for tool in halt poweroff reboot shutdown; do - ln -s systemctl "$pkgdir"/usr/bin/$tool - done -} - -# vim:ft=sh syn=sh et sw=2: diff --git a/libre/systemd/initcpio-hook-udev b/libre/systemd/initcpio-hook-udev index ea9a11f..dfa8750 100644 --- a/libre/systemd/initcpio-hook-udev +++ b/libre/systemd/initcpio-hook-udev @@ -3,7 +3,11 @@ run_earlyhook() { kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf systemd-tmpfiles --prefix=/dev --create --boot - /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never + if [ "${quiet}" = "y" ]; then + /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never >/dev/null 2>&1 + else + /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never + fi udevd_running=1 } diff --git a/libre/systemd/initcpio-install-systemd b/libre/systemd/initcpio-install-systemd index c9aa082..3355f4b 100644 --- a/libre/systemd/initcpio-install-systemd +++ b/libre/systemd/initcpio-install-systemd @@ -70,6 +70,7 @@ build() { map add_binary \ /usr/bin/journalctl \ /usr/bin/systemd-tmpfiles \ + /usr/lib/systemd/systemd-executor \ /usr/lib/systemd/systemd-hibernate-resume \ /usr/lib/systemd/systemd-shutdown \ /usr/lib/systemd/systemd-sulogin-shell \ @@ -77,47 +78,64 @@ build() { /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator - # udev rules and systemd units + # udev rules map add_udev_rule "$rules" \ - 50-udev-default.rules \ - 60-persistent-storage.rules \ - 64-btrfs.rules \ - 80-drivers.rules \ - 99-systemd.rules + 50-udev-default.rules \ + 60-persistent-storage.rules \ + 64-btrfs.rules \ + 80-drivers.rules \ + 99-systemd.rules + # systemd units map add_systemd_unit \ - initrd-cleanup.service \ - initrd-fs.target \ - initrd-parse-etc.service \ - initrd-root-fs.target \ - initrd-root-device.target \ - initrd-switch-root.service \ - initrd-switch-root.target \ - initrd-udevadm-cleanup-db.service \ - initrd.target \ - kmod-static-nodes.service \ - local-fs.target \ - local-fs-pre.target \ - paths.target \ - reboot.target \ - slices.target \ - sockets.target \ - swap.target \ - systemd-fsck@.service \ - systemd-hibernate-resume@.service \ - systemd-journald-audit.socket \ - systemd-journald-dev-log.socket \ - systemd-journald.service \ - systemd-modules-load.service \ - systemd-pcrphase-initrd.service \ - systemd-tmpfiles-setup-dev.service \ - systemd-udevd-control.socket \ - systemd-udevd-kernel.socket \ - systemd-udevd.service \ - systemd-udev-trigger.service \ - timers.target \ - rescue.target \ - emergency.target + initrd-cleanup.service \ + initrd-fs.target \ + initrd-parse-etc.service \ + initrd-root-fs.target \ + initrd-root-device.target \ + initrd-switch-root.service \ + initrd-switch-root.target \ + initrd-udevadm-cleanup-db.service \ + initrd.target \ + kmod-static-nodes.service \ + local-fs.target \ + local-fs-pre.target \ + paths.target \ + reboot.target \ + slices.target \ + sockets.target \ + swap.target \ + systemd-battery-check.service \ + systemd-bsod.service \ + systemd-fsck@.service \ + systemd-hibernate-resume.service \ + systemd-journald-audit.socket \ + systemd-journald-dev-log.socket \ + systemd-journald.service \ + systemd-modules-load.service \ + systemd-pcrphase-initrd.service \ + systemd-tmpfiles-setup-dev.service \ + systemd-udevd-control.socket \ + systemd-udevd-kernel.socket \ + systemd-udevd.service \ + systemd-udev-trigger.service \ + systemd-vconsole-setup.service \ + timers.target \ + rescue.target \ + emergency.target + + # add libraries dlopen()ed (hard and optional dependencies): + # tss2-* -> tpm2-util + # qrencode -> bsod + for LIB in tss2-{esys,rc,mu,tcti-'*'} qrencode; do + for FILE in $(find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*"); do + if [[ -L "${FILE}" ]]; then + add_symlink "${FILE}" + else + add_binary "${FILE}" + fi + done + done add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" @@ -137,6 +155,8 @@ build() { set -f printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf" ) + + [[ -f /etc/fstab.initramfs ]] && add_file "/etc/fstab.initramfs" "/etc/fstab" } help() { diff --git a/libre/systemd/systemd-hook b/libre/systemd/systemd-hook index d40fad3..d64341f 100644 --- a/libre/systemd/systemd-hook +++ b/libre/systemd/systemd-hook @@ -15,22 +15,67 @@ systemd_live() { fi } +udevd_live() { + is_chrooted + if [ ! -S /run/udev/control ]; then + echo >&2 " Skipped: Device manager is not running." + exit 0 + fi +} + op="$1"; shift case "$op" in - catalog) /usr/bin/journalctl --update-catalog ;; - update) touch -c /usr ;; - sysusers) /usr/bin/systemd-sysusers ;; - tmpfiles) /usr/bin/systemd-tmpfiles --create ;; - - daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;; - binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;; - sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;; + binfmt) + systemd_live + /usr/lib/systemd/systemd-binfmt + ;; + catalog) + /usr/bin/journalctl --update-catalog + ;; + daemon-reload-system) + systemd_live + /usr/bin/systemctl --system daemon-reload + ;; + daemon-reload-user) + systemd_live + /usr/bin/systemctl kill --kill-whom='main' --signal='SIGHUP' 'user@*.service' + ;; + hwdb) + /usr/bin/systemd-hwdb --usr update + ;; + sysctl) + systemd_live + /usr/lib/systemd/systemd-sysctl + ;; + sysusers) + /usr/bin/systemd-sysusers + ;; + tmpfiles) + /usr/bin/systemd-tmpfiles --create + ;; + update) + touch -c /usr + ;; + udev-reload) + udevd_live + /usr/bin/udevadm control --reload + if [ ! -e /etc/systemd/do-not-udevadm-trigger-on-update ]; then + /usr/bin/udevadm trigger -c change + /usr/bin/udevadm settle + fi + ;; # For use by other packages - reload) systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;; + reload) + systemd_live + /usr/bin/systemctl try-reload-or-restart "$@" + ;; - *) echo >&2 " Invalid operation '$op'"; exit 1 ;; + *) + echo >&2 " Invalid operation '$op'" + exit 1 + ;; esac exit 0 diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install index 536e54d..d5f0a68 100644 --- a/libre/systemd/systemd.install +++ b/libre/systemd/systemd.install @@ -15,15 +15,6 @@ post_common() { journalctl --update-catalog } -_242_0_2_changes() { - if [[ -L var/lib/systemd/timesync ]]; then - rm var/lib/systemd/timesync - if [[ -d var/lib/private/systemd/timesync ]]; then - mv var/lib/{private/,}systemd/timesync - fi - fi -} - post_install() { systemd-machine-id-setup @@ -34,7 +25,8 @@ post_install() { # enable some services by default, but don't track them systemctl enable \ getty@tty1.service \ - remote-fs.target + remote-fs.target \ + systemd-userdbd.socket # group 'systemd-journal-remote' is created by systemd-sysusers mkdir -m2755 var/log/journal/remote @@ -46,10 +38,10 @@ post_upgrade() { if sd_booted; then systemctl --system daemon-reexec + systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service' fi local v upgrades=( - 242.0-2 ) for v in "${upgrades[@]}"; do From 181661ec837b2bd074c8801959a82c94a4a912e9 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 14 2024 00:10:11 +0000 Subject: [PATCH 59/73] libre/grub: Hopefully speed up the device-specific ARM builds It was re-compiling everything in the package_grub-*() functions, so hopefully preserving timestamps avoids that. --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 8bf814d..56dcde4 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -519,7 +519,7 @@ _package_grub-uboot-dev() { optdepends+=('dosfstools: For grub-mkrescue FAT FS') echo "Copy the source for packaging the U-Boot ($devname) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_$devname/" + cp -a "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_$devname/" cd "${srcdir}/grub-uboot_$devname/" echo "Patch to detect $devname device tree blob file (dtb)..." From 3bebbe97a48eac34e4a215fdc20d31e2d6c30fb6 Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 14 2024 02:07:53 +0000 Subject: [PATCH 60/73] libre/grub: Fix a typo This caused the device-specific arm-uboot packages to include debug information that we try to remove. --- diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 56dcde4..5491fb6 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -525,7 +525,7 @@ _package_grub-uboot-dev() { echo "Patch to detect $devname device tree blob file (dtb)..." patch -Np1 -i "${srcdir}/1000-${pkgname#grub-}--10_linux-20_linux_xen-detect-devicetree-file.patch" - _package_grub "uboot_$devname" "$devdesc" 'arm' 'uboot' + _package_grub "uboot_$devname" "$devdesc" 'arm-uboot' echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" From e569121bd500127753070dadbabd8ecd4fda324a Mon Sep 17 00:00:00 2001 From: Luke T. Shumaker Date: Jan 14 2024 02:07:53 +0000 Subject: [PATCH 61/73] libre/grub: Merge changes from Arch; upgpkg 2.06→2.12 --- diff --git a/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch b/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch index 867e8fe..b93232a 100644 --- a/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch +++ b/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch @@ -1,17 +1,26 @@ -From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001 +From 7d7aba5cc8f978ce8f14c4d040fc6ef70b4a14db Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 10 Mar 2021 18:42:25 +0100 -Subject: [PATCH] 00_header: add GRUB_COLOR_* variables +Subject: [PATCH 1/4] 00_header: add GRUB_COLOR_* variables + +Based on the following downstream commits: + + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/514d26f6eb551b33974a7f05bbc70009f7081a1b + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/fa9d34525f424546cf83cf396ef7d6d4b817640b + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/34aabe57e67b8951448b8210ba2fd1b41ac6d19f + +Co-Authored-By: Tobias Powalowski (2013) +Co-Authored-By: Christian Hesse (2021) --- util/grub-mkconfig.in | 2 ++ util/grub.d/00_header.in | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f8cbb8d7a..1189d95f9 100644 +index 32c480dae..1a945085c 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -246,6 +246,8 @@ export GRUB_DEFAULT \ +@@ -250,6 +250,8 @@ export GRUB_DEFAULT \ GRUB_BACKGROUND \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ @@ -21,7 +30,7 @@ index f8cbb8d7a..1189d95f9 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 93a90233e..c5955df00 100644 +index 6a316a5ba..6816e09d4 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -125,6 +125,14 @@ cat < +Date: Sat, 13 Jan 2024 15:54:01 -0700 +Subject: [PATCH 2/4] 10_linux, 20_linux_xen: detect parabola initramfs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Based on the following downstream commits: + + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/438b56c08a536202ae922c8a3f6023bd9aea7330 + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/1c268927020d5ee37055250ee3de3ce4fdae23eb + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/fa9d34525f424546cf83cf396ef7d6d4b817640b + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/5347cbc7b8122e4f36068c12a649960240c4be07 + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/80d4490bc85d2b35a6e08c1bb3211391e70f24ca + + - https://git.parabola.nu/abslibre.git/commit/?id=575127b3d909f886e87526c3e9369fe690d862c2 + - https://git.parabola.nu/abslibre.git/commit/?id=be608b5fc736ea2249b1224f2f6999cb76ca5059 + - https://git.parabola.nu/abslibre.git/commit/?id=cfc5b3757f11b7760d5246cd181f084328cae912 + - https://git.parabola.nu/abslibre.git/commit/?id=ede60ed00d4c781adadca99ddef19be1bf56e8aa + - https://git.parabola.nu/abslibre.git/commit/?id=eaf3d6f308094aca4f87ed111c2580e81b18f269 + - https://git.parabola.nu/abslibre.git/commit/?id=d3fff86fb7d77716f3ca171b633bd462202a3b18 + - https://git.parabola.nu/abslibre.git/commit/?id=856b2c7c881ecf9ef2607a9a4c4466635fea857f + +Co-Authored-By: Keshav Amburay (2014) +Co-Authored-By: Tobias Powalowski (2014) +Co-Authored-By: Christian Hesse (2016, 2021) +Co-Authored-By: André Fabian Silva Delgado (2014) +Co-Authored-By: Márcio Alexandre Silva Delgado (2014-2015) +Co-Authored-By: Omar Vega Ramos (2021) +--- + util/grub.d/10_linux.in | 37 ++++++++++++++++++++++++++++++++----- + util/grub.d/20_linux_xen.in | 24 +++++++++++++++++++----- + 2 files changed, 51 insertions(+), 10 deletions(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index cc393be7e..772966b89 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -93,10 +93,14 @@ linux_entry () fi if [ x$type != xsimple ] ; then case $type in @@ -17,7 +54,7 @@ esac if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" -@@ -106,7 +110,7 @@ +@@ -108,7 +112,7 @@ linux_entry () else echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi @@ -26,7 +63,7 @@ save_default_entry | grub_add_tab fi -@@ -138,7 +142,7 @@ +@@ -140,7 +144,7 @@ linux_entry () fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" fi @@ -35,7 +72,7 @@ sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -198,7 +202,7 @@ +@@ -210,7 +214,7 @@ for linux in ${reverse_sorted_list}; do basename=`basename $linux` dirname=`dirname $linux` rel_dirname=`make_system_path_relative_to_its_root $dirname` @@ -44,7 +81,7 @@ alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" -@@ -285,6 +289,29 @@ +@@ -299,6 +303,29 @@ for linux in ${reverse_sorted_list}; do linux_entry "${OS}" "${version}" advanced \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" @@ -73,24 +110,26 @@ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-17 03:22:43.732079272 -0500 -@@ -117,9 +117,11 @@ + "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}" +diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in +index 94dd8be13..abc2fd7b4 100644 +--- a/util/grub.d/20_linux_xen.in ++++ b/util/grub.d/20_linux_xen.in +@@ -120,9 +120,11 @@ linux_entry_xsm () fi if [ x$type != xsimple ] ; then if [ x$type = xrecovery ] ; then -- title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" -+ title="$(gettext_printf "%s, with Xen %s and %s kernel (recovery mode)" "${os}" "${xen_version}" "${version}")" +- title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${entry_xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel (recovery mode)" "${os}" "${entry_xen_version}" "${version}")" + elif [ x$type = xfallback ] ; then -+ title="$(gettext_printf "%s, with Xen %s and %s kernel (fallback initramfs)" "${os}" "${xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel (fallback initramfs)" "${os}" "${entry_ xen_version}" "${version}")" else -- title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" -+ title="$(gettext_printf "%s, with Xen %s and %s kernel" "${os}" "${xen_version}" "${version}")" +- title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${entry_xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel" "${os}" "${entry_xen_version}" "${version}")" fi replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" - if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then -@@ -132,7 +134,7 @@ + if [ x"Xen ${entry_xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then +@@ -135,7 +137,7 @@ linux_entry_xsm () title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi @@ -99,16 +138,16 @@ save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" fi -@@ -141,7 +143,7 @@ +@@ -144,7 +146,7 @@ linux_entry_xsm () fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" + xmessage="$(gettext_printf "Loading Xen %s ..." ${entry_xen_version})" - lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" + lmessage="$(gettext_printf "Loading %s kernel ..." ${version})" sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$xmessage" | grub_quote)' if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then -@@ -275,7 +277,7 @@ +@@ -290,7 +292,7 @@ for current_xen in ${reverse_sorted_xen_list}; do basename=`basename $linux` dirname=`dirname $linux` rel_dirname=`make_system_path_relative_to_its_root $dirname` @@ -117,7 +156,7 @@ alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" -@@ -341,6 +343,18 @@ +@@ -361,6 +363,18 @@ for current_xen in ${reverse_sorted_xen_list}; do linux_entry "${OS}" "${version}" "${xen_version}" advanced \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" @@ -135,4 +174,7 @@ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" "${xen_version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" + "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" +-- +2.43.0 + diff --git a/libre/grub/0003-10_linux-20_linux_xen-rebrand-free-distros.patch b/libre/grub/0003-10_linux-20_linux_xen-rebrand-free-distros.patch deleted file mode 100644 index 47added..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-rebrand-free-distros.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in ---- a/util/grub.d/10_linux.in 2015-09-27 14:14:45.544730230 -0300 -+++ b/util/grub.d/10_linux.in 2015-09-27 14:58:23.533917184 -0300 -@@ -31,7 +31,17 @@ - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux - else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then -+ OS="${GRUB_DISTRIBUTOR} Linux and GNU" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then -+ OS="${GRUB_DISTRIBUTOR} GNU+Linux" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ else -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ fi - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" - fi - -diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in ---- a/util/grub.d/20_linux_xen.in 2015-09-27 14:14:45.544730230 -0300 -+++ b/util/grub.d/20_linux_xen.in 2015-09-27 14:59:16.319319658 -0300 -@@ -31,7 +31,17 @@ - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux - else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then -+ OS="${GRUB_DISTRIBUTOR} Linux and GNU" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then -+ OS="${GRUB_DISTRIBUTOR} GNU+Linux" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ else -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ fi - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" - fi - diff --git a/libre/grub/0003-support-dropins-for-default-configuration.patch b/libre/grub/0003-support-dropins-for-default-configuration.patch new file mode 100644 index 0000000..fceb6b7 --- /dev/null +++ b/libre/grub/0003-support-dropins-for-default-configuration.patch @@ -0,0 +1,33 @@ +From 0c26d3cee253313e61c47d1954ca24097e21f948 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Mon, 12 Jun 2023 07:42:01 +0200 +Subject: [PATCH 3/4] support dropins for default configuration + +Based on the following downstream commits: + + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/beee9df4ae2e3b2150d4e54b3825064e77661cb4 + +Co-Authored-By: Christian Hesse (2023) +--- + util/grub-mkconfig.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 1a945085c..4338dceef 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -160,6 +160,11 @@ fi + if test -f ${sysconfdir}/default/grub ; then + . ${sysconfdir}/default/grub + fi ++for dropin in ${sysconfdir}/default/grub.d/*.cfg ; do ++ if test -f "${dropin}" ; then ++ . "${dropin}" ++ fi ++done + + if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then + if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then +-- +2.43.0 + diff --git a/libre/grub/0004-10_linux-20_linux_xen-rebrand-free-distros.patch b/libre/grub/0004-10_linux-20_linux_xen-rebrand-free-distros.patch new file mode 100644 index 0000000..6758463 --- /dev/null +++ b/libre/grub/0004-10_linux-20_linux_xen-rebrand-free-distros.patch @@ -0,0 +1,73 @@ +From 85a3be8fc73ca019f7ea89c7872ce06c028cfc2f Mon Sep 17 00:00:00 2001 +From: "Luke T. Shumaker" +Date: Sat, 13 Jan 2024 16:08:36 -0700 +Subject: [PATCH 4/4] 10_linux, 20_linux_xen: rebrand free distros +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Based on the following downstream commits: + + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/df234e54c93f3e4e3f78835ad5bda9fb6dbd2a97 + + - https://git.parabola.nu/abslibre.git/commit/?id=554b8e3c70a352c2b80f374661ef6ea5f178617b + - https://git.parabola.nu/abslibre.git/commit/?id=ad20b5222cc70c36f75acadee9ed477af99c41a3 + - https://git.parabola.nu/abslibre.git/commit/?id=bf492125a9aa1c1f7eee0be6c2794b20fb734381 + +Co-Authored-By: Ronald van Haren (2013) +Co-Authored-By: André Fabian Silva Delgado (2014) +Co-Authored-By: Márcio Alexandre Silva Delgado (2015) +--- + util/grub.d/10_linux.in | 12 +++++++++++- + util/grub.d/20_linux_xen.in | 12 +++++++++++- + 2 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 772966b89..5f8c47234 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -31,7 +31,17 @@ CLASS="--class gnu-linux --class gnu --class os" + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux + else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ else ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ fi + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" + fi + +diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in +index abc2fd7b4..2b2dd5009 100644 +--- a/util/grub.d/20_linux_xen.in ++++ b/util/grub.d/20_linux_xen.in +@@ -31,7 +31,17 @@ CLASS="--class gnu-linux --class gnu --class os --class xen" + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux + else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ else ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ fi + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" + fi + +-- +2.43.0 + diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 5491fb6..d47c586 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -90,18 +90,17 @@ fi pkgdesc='GNU GRand Unified Bootloader (2)' pkgdesc+=', (Parabola rebranded)' epoch=2 -_tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver} -_gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3' -_unifont_ver='13.0.06' -_pkgver=2.06 +_tag='03e6ea18f6f834f177cad017279bedbb0a3de594' # git rev-parse grub-${_pkgver} +_pkgver=2.12 +_unifont_ver='15.1.04' pkgver=${_pkgver/-/} pkgrel=1 -pkgrel+=.parabola2 +pkgrel+=.parabola1 url='https://www.gnu.org/software/grub/' arch=('x86_64') arch+=('i686') arch+=('armv7h') -license=('GPL3') +license=('GPL-3.0-or-later') backup=('etc/default/grub' 'etc/grub.d/40_custom') install="${pkgname}.install" @@ -119,11 +118,12 @@ if [[ "${CARCH}" = 'armv7h' ]]; then fi makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' - 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2') + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse3') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' - 'fuse2: For grub-mount usage' + 'fuse3: For grub-mount usage' #'dosfstools: For grub-mkrescue FAT FS and EFI support' # drop 'and EFI' from the device-specific arm-uboot packages + 'lzop: For grub-mkrescue LZO support' #'efibootmgr: For grub-install EFI support' # drop from the device-specific arm-uboot packages #'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' # drop from the device-specific arm-uboot packages 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' @@ -144,12 +144,14 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed" - "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}" + 'git+https://git.savannah.gnu.org/git/gnulib.git' "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig} '0001-00_header-add-GRUB_COLOR_-variables.patch' '0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch' - '0003-10_linux-20_linux_xen-rebrand-free-distros.patch' - 'grub.default') + '0003-support-dropins-for-default-configuration.patch' + '0004-10_linux-20_linux_xen-rebrand-free-distros.patch' + 'grub.default' + 'sbat.csv') source_armv7h=( '1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch' '1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch' @@ -159,12 +161,14 @@ source_armv7h=( sha256sums=('SKIP' 'SKIP' - 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5' + '88e00954b10528407e62e97ce6eaa88c847ebfd9a464cafde6bf55c7e4eeed54' 'SKIP' - '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' - 'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f' - '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4' - 'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879') + 'c25a09792ad97ca93ff385f1821b8c071b28d0ee86c1c4af9365cc00dc5b2b12' + '1dd3df0838f9aa737beb0298b855bc93b07d8f3926460ccb8b8f30f5fece3abf' + 'a096658d0f48a8b8d0d526d679c2106d0a5bf2a5afb6f2ca7e37f1f2ac33fd85' + '281a5225d68be7c230ff2d8175d920bf507439f3fc42cbe866fc31530a1465d3' + 'c7c38d62c1238671a09094ceb71befc3fe3873f18343ef0a6f3089d9576dbd43' + '50cab883c2412bb583c0521ed34e75aa080ccfc50826ab9d02a4db250ae5c05e') sha256sums_armv7h=('0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32' 'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87' 'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56' @@ -174,10 +178,13 @@ sha256sums_armv7h=('0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c _backports=( ) +_reverts=( +) + _configure_options=( + PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}" FREETYPE="pkg-config freetype2" BUILD_FREETYPE="pkg-config freetype2" - --enable-mm-debug --enable-nls --enable-device-mapper --enable-cache-stats @@ -207,18 +214,28 @@ prepare() { git cherry-pick -n "${_c}" done + echo "Apply reverts..." + local _c + for _c in "${_reverts[@]}"; do + git log --oneline -1 "${_c}" + git revert -n "${_c}" + done + echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..." ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html - patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" + patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" echo "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig..." patch -Np1 -i "${srcdir}/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch" + echo "Patch to support dropins for default configuration..." + patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch" + echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..." sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac" echo "Rebranding for some free distros..." - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-rebrand-free-distros.patch" + patch -Np1 -i "${srcdir}/0004-10_linux-20_linux_xen-rebrand-free-distros.patch" echo "Fix mkinitcpio 'rw' FS#36275..." sed 's| ro | rw |g' -i "util/grub.d/10_linux.in" @@ -424,6 +441,8 @@ _package_grub-bios() { _package_grub-efi() { _package_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} efi" \ "${_EFI_ARCH}-efi" + + sed -e "s/%PKGVER%/${epoch}:${pkgver}-${pkgrel}/" -e "s/%CARCH%/${CARCH}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv" } _package_grub-emu() { diff --git a/libre/grub/grub.default b/libre/grub/grub.default index 8861466..6271d8d 100644 --- a/libre/grub/grub.default +++ b/libre/grub/grub.default @@ -24,7 +24,7 @@ GRUB_TERMINAL_INPUT=console # The resolution used on graphical terminal # note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' +# you can see them in real GRUB with the command `videoinfo' GRUB_GFXMODE=auto # Uncomment to allow the kernel use the same resolution used by grub @@ -55,3 +55,9 @@ GRUB_COLOR_HIGHLIGHT="white/magenta" # Uncomment to disable submenus in boot menu #GRUB_DISABLE_SUBMENU=y + +# Probing for other operating systems is disabled for security reasons. Read +# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this +# functionality install os-prober and uncomment to detect and include other +# operating systems. +#GRUB_DISABLE_OS_PROBER=false diff --git a/libre/grub/grub.install b/libre/grub/grub.install index c268996..7969342 100644 --- a/libre/grub/grub.install +++ b/libre/grub/grub.install @@ -7,6 +7,16 @@ post_upgrade() { mv /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg fi + # Give a hint to update installation and configuration one after another. + cat < 0 )) && return @@ -21,8 +31,8 @@ EOM post_install() { cat < Date: Jan 14 2024 04:18:57 +0000 Subject: [PATCH 62/73] Merge branch 'lukeshu/grub-pt2' --- diff --git a/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch b/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch index 867e8fe..b93232a 100644 --- a/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch +++ b/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch @@ -1,17 +1,26 @@ -From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001 +From 7d7aba5cc8f978ce8f14c4d040fc6ef70b4a14db Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 10 Mar 2021 18:42:25 +0100 -Subject: [PATCH] 00_header: add GRUB_COLOR_* variables +Subject: [PATCH 1/4] 00_header: add GRUB_COLOR_* variables + +Based on the following downstream commits: + + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/514d26f6eb551b33974a7f05bbc70009f7081a1b + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/fa9d34525f424546cf83cf396ef7d6d4b817640b + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/34aabe57e67b8951448b8210ba2fd1b41ac6d19f + +Co-Authored-By: Tobias Powalowski (2013) +Co-Authored-By: Christian Hesse (2021) --- util/grub-mkconfig.in | 2 ++ util/grub.d/00_header.in | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f8cbb8d7a..1189d95f9 100644 +index 32c480dae..1a945085c 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -246,6 +246,8 @@ export GRUB_DEFAULT \ +@@ -250,6 +250,8 @@ export GRUB_DEFAULT \ GRUB_BACKGROUND \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ @@ -21,7 +30,7 @@ index f8cbb8d7a..1189d95f9 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 93a90233e..c5955df00 100644 +index 6a316a5ba..6816e09d4 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -125,6 +125,14 @@ cat < +Date: Sat, 13 Jan 2024 15:54:01 -0700 +Subject: [PATCH 2/4] 10_linux, 20_linux_xen: detect parabola initramfs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Based on the following downstream commits: + + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/438b56c08a536202ae922c8a3f6023bd9aea7330 + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/1c268927020d5ee37055250ee3de3ce4fdae23eb + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/fa9d34525f424546cf83cf396ef7d6d4b817640b + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/5347cbc7b8122e4f36068c12a649960240c4be07 + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/80d4490bc85d2b35a6e08c1bb3211391e70f24ca + + - https://git.parabola.nu/abslibre.git/commit/?id=575127b3d909f886e87526c3e9369fe690d862c2 + - https://git.parabola.nu/abslibre.git/commit/?id=be608b5fc736ea2249b1224f2f6999cb76ca5059 + - https://git.parabola.nu/abslibre.git/commit/?id=cfc5b3757f11b7760d5246cd181f084328cae912 + - https://git.parabola.nu/abslibre.git/commit/?id=ede60ed00d4c781adadca99ddef19be1bf56e8aa + - https://git.parabola.nu/abslibre.git/commit/?id=eaf3d6f308094aca4f87ed111c2580e81b18f269 + - https://git.parabola.nu/abslibre.git/commit/?id=d3fff86fb7d77716f3ca171b633bd462202a3b18 + - https://git.parabola.nu/abslibre.git/commit/?id=856b2c7c881ecf9ef2607a9a4c4466635fea857f + +Co-Authored-By: Keshav Amburay (2014) +Co-Authored-By: Tobias Powalowski (2014) +Co-Authored-By: Christian Hesse (2016, 2021) +Co-Authored-By: André Fabian Silva Delgado (2014) +Co-Authored-By: Márcio Alexandre Silva Delgado (2014-2015) +Co-Authored-By: Omar Vega Ramos (2021) +--- + util/grub.d/10_linux.in | 37 ++++++++++++++++++++++++++++++++----- + util/grub.d/20_linux_xen.in | 24 +++++++++++++++++++----- + 2 files changed, 51 insertions(+), 10 deletions(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index cc393be7e..772966b89 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -93,10 +93,14 @@ linux_entry () fi if [ x$type != xsimple ] ; then case $type in @@ -17,7 +54,7 @@ esac if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" -@@ -106,7 +110,7 @@ +@@ -108,7 +112,7 @@ linux_entry () else echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi @@ -26,7 +63,7 @@ save_default_entry | grub_add_tab fi -@@ -138,7 +142,7 @@ +@@ -140,7 +144,7 @@ linux_entry () fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" fi @@ -35,7 +72,7 @@ sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -198,7 +202,7 @@ +@@ -210,7 +214,7 @@ for linux in ${reverse_sorted_list}; do basename=`basename $linux` dirname=`dirname $linux` rel_dirname=`make_system_path_relative_to_its_root $dirname` @@ -44,7 +81,7 @@ alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" -@@ -285,6 +289,29 @@ +@@ -299,6 +303,29 @@ for linux in ${reverse_sorted_list}; do linux_entry "${OS}" "${version}" advanced \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" @@ -73,24 +110,26 @@ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" ---- a/util/grub.d/20_linux_xen.in 2021-06-17 03:06:56.202081000 -0500 -+++ b/util/grub.d/20_linux_xen.in 2021-06-17 03:22:43.732079272 -0500 -@@ -117,9 +117,11 @@ + "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}" +diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in +index 94dd8be13..abc2fd7b4 100644 +--- a/util/grub.d/20_linux_xen.in ++++ b/util/grub.d/20_linux_xen.in +@@ -120,9 +120,11 @@ linux_entry_xsm () fi if [ x$type != xsimple ] ; then if [ x$type = xrecovery ] ; then -- title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" -+ title="$(gettext_printf "%s, with Xen %s and %s kernel (recovery mode)" "${os}" "${xen_version}" "${version}")" +- title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${entry_xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel (recovery mode)" "${os}" "${entry_xen_version}" "${version}")" + elif [ x$type = xfallback ] ; then -+ title="$(gettext_printf "%s, with Xen %s and %s kernel (fallback initramfs)" "${os}" "${xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel (fallback initramfs)" "${os}" "${entry_ xen_version}" "${version}")" else -- title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" -+ title="$(gettext_printf "%s, with Xen %s and %s kernel" "${os}" "${xen_version}" "${version}")" +- title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${entry_xen_version}" "${version}")" ++ title="$(gettext_printf "%s, with Xen %s and %s kernel" "${os}" "${entry_xen_version}" "${version}")" fi replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" - if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then -@@ -132,7 +134,7 @@ + if [ x"Xen ${entry_xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then +@@ -135,7 +137,7 @@ linux_entry_xsm () title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi @@ -99,16 +138,16 @@ save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" fi -@@ -141,7 +143,7 @@ +@@ -144,7 +146,7 @@ linux_entry_xsm () fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" + xmessage="$(gettext_printf "Loading Xen %s ..." ${entry_xen_version})" - lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" + lmessage="$(gettext_printf "Loading %s kernel ..." ${version})" sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$xmessage" | grub_quote)' if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then -@@ -275,7 +277,7 @@ +@@ -290,7 +292,7 @@ for current_xen in ${reverse_sorted_xen_list}; do basename=`basename $linux` dirname=`dirname $linux` rel_dirname=`make_system_path_relative_to_its_root $dirname` @@ -117,7 +156,7 @@ alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" -@@ -341,6 +343,18 @@ +@@ -361,6 +363,18 @@ for current_xen in ${reverse_sorted_xen_list}; do linux_entry "${OS}" "${version}" "${xen_version}" advanced \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" @@ -135,4 +174,7 @@ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" "${xen_version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" + "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" +-- +2.43.0 + diff --git a/libre/grub/0003-10_linux-20_linux_xen-rebrand-free-distros.patch b/libre/grub/0003-10_linux-20_linux_xen-rebrand-free-distros.patch deleted file mode 100644 index 47added..0000000 --- a/libre/grub/0003-10_linux-20_linux_xen-rebrand-free-distros.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in ---- a/util/grub.d/10_linux.in 2015-09-27 14:14:45.544730230 -0300 -+++ b/util/grub.d/10_linux.in 2015-09-27 14:58:23.533917184 -0300 -@@ -31,7 +31,17 @@ - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux - else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then -+ OS="${GRUB_DISTRIBUTOR} Linux and GNU" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then -+ OS="${GRUB_DISTRIBUTOR} GNU+Linux" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ else -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ fi - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" - fi - -diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in ---- a/util/grub.d/20_linux_xen.in 2015-09-27 14:14:45.544730230 -0300 -+++ b/util/grub.d/20_linux_xen.in 2015-09-27 14:59:16.319319658 -0300 -@@ -31,7 +31,17 @@ - if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux - else -- OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then -+ OS="${GRUB_DISTRIBUTOR} Linux and GNU" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then -+ OS="${GRUB_DISTRIBUTOR} GNU+Linux" -+ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" -+ else -+ OS="${GRUB_DISTRIBUTOR} GNU/Linux" -+ fi - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" - fi - diff --git a/libre/grub/0003-support-dropins-for-default-configuration.patch b/libre/grub/0003-support-dropins-for-default-configuration.patch new file mode 100644 index 0000000..fceb6b7 --- /dev/null +++ b/libre/grub/0003-support-dropins-for-default-configuration.patch @@ -0,0 +1,33 @@ +From 0c26d3cee253313e61c47d1954ca24097e21f948 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Mon, 12 Jun 2023 07:42:01 +0200 +Subject: [PATCH 3/4] support dropins for default configuration + +Based on the following downstream commits: + + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/beee9df4ae2e3b2150d4e54b3825064e77661cb4 + +Co-Authored-By: Christian Hesse (2023) +--- + util/grub-mkconfig.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 1a945085c..4338dceef 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -160,6 +160,11 @@ fi + if test -f ${sysconfdir}/default/grub ; then + . ${sysconfdir}/default/grub + fi ++for dropin in ${sysconfdir}/default/grub.d/*.cfg ; do ++ if test -f "${dropin}" ; then ++ . "${dropin}" ++ fi ++done + + if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then + if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then +-- +2.43.0 + diff --git a/libre/grub/0004-10_linux-20_linux_xen-rebrand-free-distros.patch b/libre/grub/0004-10_linux-20_linux_xen-rebrand-free-distros.patch new file mode 100644 index 0000000..6758463 --- /dev/null +++ b/libre/grub/0004-10_linux-20_linux_xen-rebrand-free-distros.patch @@ -0,0 +1,73 @@ +From 85a3be8fc73ca019f7ea89c7872ce06c028cfc2f Mon Sep 17 00:00:00 2001 +From: "Luke T. Shumaker" +Date: Sat, 13 Jan 2024 16:08:36 -0700 +Subject: [PATCH 4/4] 10_linux, 20_linux_xen: rebrand free distros +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Based on the following downstream commits: + + - https://gitlab.archlinux.org/archlinux/packaging/packages/grub/-/commit/df234e54c93f3e4e3f78835ad5bda9fb6dbd2a97 + + - https://git.parabola.nu/abslibre.git/commit/?id=554b8e3c70a352c2b80f374661ef6ea5f178617b + - https://git.parabola.nu/abslibre.git/commit/?id=ad20b5222cc70c36f75acadee9ed477af99c41a3 + - https://git.parabola.nu/abslibre.git/commit/?id=bf492125a9aa1c1f7eee0be6c2794b20fb734381 + +Co-Authored-By: Ronald van Haren (2013) +Co-Authored-By: André Fabian Silva Delgado (2014) +Co-Authored-By: Márcio Alexandre Silva Delgado (2015) +--- + util/grub.d/10_linux.in | 12 +++++++++++- + util/grub.d/20_linux_xen.in | 12 +++++++++++- + 2 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 772966b89..5f8c47234 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -31,7 +31,17 @@ CLASS="--class gnu-linux --class gnu --class os" + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux + else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ else ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ fi + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" + fi + +diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in +index abc2fd7b4..2b2dd5009 100644 +--- a/util/grub.d/20_linux_xen.in ++++ b/util/grub.d/20_linux_xen.in +@@ -31,7 +31,17 @@ CLASS="--class gnu-linux --class gnu --class os --class xen" + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux + else +- OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ if echo ${GRUB_DISTRIBUTOR} | grep -qi Parabola ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Blag ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Musix ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" ++ elif echo ${GRUB_DISTRIBUTOR} | grep -qi Dragora ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ else ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux" ++ fi + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" + fi + +-- +2.43.0 + diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 8bf814d..d47c586 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -90,18 +90,17 @@ fi pkgdesc='GNU GRand Unified Bootloader (2)' pkgdesc+=', (Parabola rebranded)' epoch=2 -_tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver} -_gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3' -_unifont_ver='13.0.06' -_pkgver=2.06 +_tag='03e6ea18f6f834f177cad017279bedbb0a3de594' # git rev-parse grub-${_pkgver} +_pkgver=2.12 +_unifont_ver='15.1.04' pkgver=${_pkgver/-/} pkgrel=1 -pkgrel+=.parabola2 +pkgrel+=.parabola1 url='https://www.gnu.org/software/grub/' arch=('x86_64') arch+=('i686') arch+=('armv7h') -license=('GPL3') +license=('GPL-3.0-or-later') backup=('etc/default/grub' 'etc/grub.d/40_custom') install="${pkgname}.install" @@ -119,11 +118,12 @@ if [[ "${CARCH}" = 'armv7h' ]]; then fi makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen' - 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2') + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse3') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' - 'fuse2: For grub-mount usage' + 'fuse3: For grub-mount usage' #'dosfstools: For grub-mkrescue FAT FS and EFI support' # drop 'and EFI' from the device-specific arm-uboot packages + 'lzop: For grub-mkrescue LZO support' #'efibootmgr: For grub-install EFI support' # drop from the device-specific arm-uboot packages #'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' # drop from the device-specific arm-uboot packages 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' @@ -144,12 +144,14 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed" - "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}" + 'git+https://git.savannah.gnu.org/git/gnulib.git' "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig} '0001-00_header-add-GRUB_COLOR_-variables.patch' '0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch' - '0003-10_linux-20_linux_xen-rebrand-free-distros.patch' - 'grub.default') + '0003-support-dropins-for-default-configuration.patch' + '0004-10_linux-20_linux_xen-rebrand-free-distros.patch' + 'grub.default' + 'sbat.csv') source_armv7h=( '1000-am335x_bone--10_linux-20_linux_xen-detect-devicetree-file.patch' '1000-omap3_beagle--10_linux-20_linux_xen-detect-devicetree-file.patch' @@ -159,12 +161,14 @@ source_armv7h=( sha256sums=('SKIP' 'SKIP' - 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5' + '88e00954b10528407e62e97ce6eaa88c847ebfd9a464cafde6bf55c7e4eeed54' 'SKIP' - '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' - 'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f' - '7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4' - 'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879') + 'c25a09792ad97ca93ff385f1821b8c071b28d0ee86c1c4af9365cc00dc5b2b12' + '1dd3df0838f9aa737beb0298b855bc93b07d8f3926460ccb8b8f30f5fece3abf' + 'a096658d0f48a8b8d0d526d679c2106d0a5bf2a5afb6f2ca7e37f1f2ac33fd85' + '281a5225d68be7c230ff2d8175d920bf507439f3fc42cbe866fc31530a1465d3' + 'c7c38d62c1238671a09094ceb71befc3fe3873f18343ef0a6f3089d9576dbd43' + '50cab883c2412bb583c0521ed34e75aa080ccfc50826ab9d02a4db250ae5c05e') sha256sums_armv7h=('0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32' 'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87' 'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56' @@ -174,10 +178,13 @@ sha256sums_armv7h=('0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c _backports=( ) +_reverts=( +) + _configure_options=( + PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}" FREETYPE="pkg-config freetype2" BUILD_FREETYPE="pkg-config freetype2" - --enable-mm-debug --enable-nls --enable-device-mapper --enable-cache-stats @@ -207,18 +214,28 @@ prepare() { git cherry-pick -n "${_c}" done + echo "Apply reverts..." + local _c + for _c in "${_reverts[@]}"; do + git log --oneline -1 "${_c}" + git revert -n "${_c}" + done + echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..." ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html - patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" + patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch" echo "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig..." patch -Np1 -i "${srcdir}/0002-10_linux-20_linux_xen-detect-parabola-initramfs.patch" + echo "Patch to support dropins for default configuration..." + patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch" + echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..." sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac" echo "Rebranding for some free distros..." - patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-rebrand-free-distros.patch" + patch -Np1 -i "${srcdir}/0004-10_linux-20_linux_xen-rebrand-free-distros.patch" echo "Fix mkinitcpio 'rw' FS#36275..." sed 's| ro | rw |g' -i "util/grub.d/10_linux.in" @@ -424,6 +441,8 @@ _package_grub-bios() { _package_grub-efi() { _package_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} efi" \ "${_EFI_ARCH}-efi" + + sed -e "s/%PKGVER%/${epoch}:${pkgver}-${pkgrel}/" -e "s/%CARCH%/${CARCH}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv" } _package_grub-emu() { @@ -519,13 +538,13 @@ _package_grub-uboot-dev() { optdepends+=('dosfstools: For grub-mkrescue FAT FS') echo "Copy the source for packaging the U-Boot ($devname) part..." - cp -r "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_$devname/" + cp -a "${srcdir}/grub-uboot/" "${srcdir}/grub-uboot_$devname/" cd "${srcdir}/grub-uboot_$devname/" echo "Patch to detect $devname device tree blob file (dtb)..." patch -Np1 -i "${srcdir}/1000-${pkgname#grub-}--10_linux-20_linux_xen-detect-devicetree-file.patch" - _package_grub "uboot_$devname" "$devdesc" 'arm' 'uboot' + _package_grub "uboot_$devname" "$devdesc" 'arm-uboot' echo 'Install /etc/default/grub (used by grub-mkconfig)...' install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" diff --git a/libre/grub/grub.default b/libre/grub/grub.default index 8861466..6271d8d 100644 --- a/libre/grub/grub.default +++ b/libre/grub/grub.default @@ -24,7 +24,7 @@ GRUB_TERMINAL_INPUT=console # The resolution used on graphical terminal # note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' +# you can see them in real GRUB with the command `videoinfo' GRUB_GFXMODE=auto # Uncomment to allow the kernel use the same resolution used by grub @@ -55,3 +55,9 @@ GRUB_COLOR_HIGHLIGHT="white/magenta" # Uncomment to disable submenus in boot menu #GRUB_DISABLE_SUBMENU=y + +# Probing for other operating systems is disabled for security reasons. Read +# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this +# functionality install os-prober and uncomment to detect and include other +# operating systems. +#GRUB_DISABLE_OS_PROBER=false diff --git a/libre/grub/grub.install b/libre/grub/grub.install index c268996..7969342 100644 --- a/libre/grub/grub.install +++ b/libre/grub/grub.install @@ -7,6 +7,16 @@ post_upgrade() { mv /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg fi + # Give a hint to update installation and configuration one after another. + cat < 0 )) && return @@ -21,8 +31,8 @@ EOM post_install() { cat < Date: Jan 15 2024 21:41:05 +0000 Subject: [PATCH 63/73] kio5: upgrade to v5.114.0 --- diff --git a/nonprism/kio5/PKGBUILD b/nonprism/kio5/PKGBUILD index 64f7caa..96a27d0 100644 --- a/nonprism/kio5/PKGBUILD +++ b/nonprism/kio5/PKGBUILD @@ -16,7 +16,7 @@ _name=kio pkgname=${_name}5 -pkgver=5.113.0 +pkgver=5.114.0 pkgrel=1 pkgrel+=.parabola1 _pkgver_i686=5.105.0 # n/a i686 @@ -49,7 +49,7 @@ source+=(duckduckgo_html.desktop parabola-wiki.desktop searx.desktop yacy.desktop) -sha256sums=('a8b110ef3cfefd53c0fadc58eca5b573319663f380fedfc35ef8d7dbf8d855ae' +sha256sums=('5fac59827b30ff6c07a564f78498ffaccd7c62a66ef77d004e86bb0dddea955b' 'SKIP') sha256sums+=('31910ab7393e67609f15e04a57f6406f63e6dae58b01bce0787741bc5958f292' '40466a9dad7075f2525e9e024720da7d7b49a22892b6fca8b81cc0e6408d2f7d' From 785a340a61717b199427657446830ee4fe2c9a3b Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 20 2024 03:57:12 +0000 Subject: [PATCH 64/73] iceweasel: minimize diff against upstreams --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 3ea7e58..f01bb32 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -208,26 +208,24 @@ b2sums+=('d6ccdc46fce7cfc4bb35a6b09deee8cd96b9076c599c1f031b4d2c5a9c2722bdf98dd1 'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch '7d7c9a67ef8035f85482b37d0b7b7743f005d5e7f48d1865f21745ebd10053ed8a6c15e1e176f42d5ef738e7bb074bdad8e912983ca4614a2aab50b95824a4a6' # 9004-FSDG-misc.patch '6224eb8db58c0d00353512d5bf420a16be90a86dc86c9a8d735026a7f77ca4a8a148fea38015fc9639254b9e02b17d01521ad6b233a890aa082fb8476992fa2f' # process-json-files.py - 'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9' # vendor.js.in - '6176a2e4b7a651b50b1ca2d6c8b62b1fd7557cacff50f38cb87f126590d9a2ac8d9b249c1671be0551cc81ce9a028a22e9b29ac121e480dab61cd7c10b891d50') # zstandard-0.22.0.diff + 'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9') # vendor.js.in b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf0de776981cdcce2438c7add2d692f4afbc85255949558852bdec9800c59882' # avoid-libxul-OOM-python-check.patch '32c60a9259f9ab6b950c0a3af81e4c36c14160860d3b9da70aa3fbc3676e5fd2b2705b02d7e6b6ac49f9510577de89ab2334abe3b0a126e3d70e65ac42ba62c9' # rust-static-disable-network-test-on-static-libraries.patch '05c7c9727201971650df4ca2e00539767fc9e159539835c641fccab5ec9577a7294e8f62f5d0670158316e5467ea121c03a36fd4ba153e1d60f3402f0430548d' # firefox-111.0.1-fdlibm.patch 'd20ce3eff595f85df86eaa0dfb665fc356f8987117a771f76adc4ac12046a7e82b0af182fa99f87ea1362a5026c9d0216c7b714649fef0c7294c61c8e8f4d790' # fix-i686-build-moz-1792159.patch '3e6fd4cebe0fd4c250ccf5b04e12b93e5f4cc2d139301316c987cc07a57b4b6b49b830d745520a82f5ac59da8d17f728a3ecce4dccf21804a2d6a256a6f76472') # fix-i686-xsimd-incomplete.patch - # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # anti-feature # Note: These are for Arch Linux use ONLY. For your own distribution, please # anti-feature # get your own set of keys. Feel free to contact foutrelis@archlinux.org for # anti-feature # more information. # anti-feature -# _google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM # anti-feature +_google_api_key= # anti-feature # Mozilla API keys (see https://location.services.mozilla.com/api) # anti-feature # Note: These are for Arch Linux use ONLY. For your own distribution, please # anti-feature # get your own set of keys. Feel free to contact heftig@archlinux.org for # anti-feature # more information. # anti-feature -# _mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a # anti-feature +_mozilla_api_key= # anti-feature ## compiler and optimization tweaks ## @@ -403,8 +401,8 @@ prepare() { ## general configuration ## - # echo -n "$_google_api_key" >google-api-key # anti-feature - # echo -n "$_mozilla_api_key" >mozilla-api-key # anti-feature + echo -n "$_google_api_key" >google-api-key + echo -n "$_mozilla_api_key" >mozilla-api-key cat >../mozconfig < content/$pkgname-symbolic.svg # TODO: branding package - cp ../unofficial/document.ico document.ico + cp iceweasel_logo.svg content/aboutlogins.svg + cp iceweasel_logo.svg content/about-logo.svg +# cp iceweasel_logo.svg content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content + rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo.png + rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png + cp content/about-logo.png content/about-logo-private.png + cp content/about-logo@2x.png content/about-logo-private@2x.png + echo "${blank_svg}" > content/$pkgname-symbolic.svg # TODO: branding package + cp content/${pkgname}-symbolic.svg "${srcdir}"/identity-icons-brand.svg # minimize diff (in package()) + cp ../unofficial/document.ico document.ico popd > /dev/null @@ -701,10 +700,11 @@ build() { ## build env ## - export MOZ_NOSPAM=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # parabola policy export MOZBUILD_STATE_PATH="$srcdir/mozbuild" + export MOZ_BUILD_DATE="$(date -u${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH} +%Y%m%d%H%M%S)" # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature - export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # parabola policy + export MOZ_NOSPAM=1 # malloc_usable_size is used in various parts of the codebase CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" @@ -870,8 +870,8 @@ app.distributor.channel=$pkgname app.partner.parabola=parabola END - # NOTE: browser/branding/$theme is $branding_destdir in prepare() - local i theme=$pkgname + local i theme=official + theme=$pkgname # NOTE: browser/branding/$theme is $branding_destdir in prepare() for i in 16 22 24 32 48 64 128 256; do install -Dvm644 browser/branding/$theme/default$i.png \ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" @@ -882,7 +882,7 @@ END "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png" install -Dvm644 browser/branding/$theme/content/about-logo.svg \ "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg" - install -Dvm644 browser/branding/$theme/content/$pkgname-symbolic.svg \ + install -Dvm644 ../identity-icons-brand.svg \ "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg" install -Dvm644 ../$pkgname.desktop \ @@ -891,8 +891,9 @@ END # Install a wrapper to avoid confusion about binary path install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" < diff --git a/libre/iceweasel/update_uniffi_to_0.21.1.patch b/libre/iceweasel/update_uniffi_to_0.21.1.patch deleted file mode 100644 index 0948f4f..0000000 --- a/libre/iceweasel/update_uniffi_to_0.21.1.patch +++ /dev/null @@ -1,2236 +0,0 @@ - -# HG changeset patch -# User Mike Hommey -# Date 1671490349 0 -# Node ID 42d532d3de54ece48fd29b0b07d160f0ec957b21 -# Parent 0a143142f96de8d71c894c0aa28300c5afc731bb -Bug 1805809 - Update uniffi to 0.21.1 for more determinism across platforms. r=janerik,supply-chain-reviewers a=RyanVM - -Differential Revision: https://phabricator.services.mozilla.com/D164896 - -diff --git a/Cargo.lock b/Cargo.lock ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -5764,19 +5764,19 @@ checksum = "3ed742d4ea2bd1176e236172c842 - [[package]] - name = "unicode-xid" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - - [[package]] - name = "uniffi" --version = "0.21.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f54af5ada67d1173457a99a7bb44a7917f63e7466764cb4714865c7a6678b830" -+version = "0.21.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b983553c0d1ad73547c65fa0c399aa800bee4a70ad330198e1c7a523212da5ee" - dependencies = [ - "anyhow", - "bytes 1.2.1", - "camino", - "cargo_metadata", - "log", - "once_cell", - "paste", -@@ -5874,19 +5874,17 @@ dependencies = [ - "uniffi", - "uniffi-example-geometry", - "uniffi_build", - "uniffi_macros", - ] - - [[package]] - name = "uniffi_bindgen" --version = "0.21.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "12cc4af3c0180c7e86c4a3acf2b6587af04ba2567b1e948993df10f421796621" -+version = "0.21.1" - dependencies = [ - "anyhow", - "askama", - "bincode", - "camino", - "clap", - "fs-err", - "goblin 0.5.4", -@@ -5897,51 +5895,63 @@ dependencies = [ - "serde_json", - "toml", - "uniffi_meta", - "weedle2", - ] - - [[package]] - name = "uniffi_build" --version = "0.21.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "510287c368a9386eb731ebe824a6fc6c82a105e20d020af1aa20519c1c1561db" -+version = "0.21.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d035e50433ee3d52ab0dcdcf3b9b26f2cc2ec39294b3c07d95865a518709455f" - dependencies = [ - "anyhow", - "camino", - "uniffi_bindgen", - ] - - [[package]] -+name = "uniffi_checksum_derive" -+version = "0.21.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78b6e16d46caf942016997af8bbdf4b163bf8ae3deb0b667d9643de7b7ffd4c9" -+dependencies = [ -+ "quote", -+ "syn", -+] -+ -+[[package]] - name = "uniffi_macros" --version = "0.21.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5c8604503caa2cbcf271578dc51ca236d40e3b22e1514ffa2e638e2c39f6ad10" -+version = "0.21.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c96a574677566f83ea8458dac1dd7792fd63e7c3f9dbcd865f0e8d6f8057b127" - dependencies = [ - "bincode", - "camino", - "fs-err", - "once_cell", - "proc-macro2", - "quote", - "serde", - "syn", - "toml", - "uniffi_build", - "uniffi_meta", - ] - - [[package]] - name = "uniffi_meta" --version = "0.21.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cd9417cc653937681436b93838d8c5f97a5b8c58697813982ee8810bd1dc3b57" -+version = "0.21.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "729835442da829c9b6f7c111c76cf87b2498e129101203bec94f0c39a3296a38" - dependencies = [ - "serde", -+ "siphasher", -+ "uniffi_checksum_derive", - ] - - [[package]] - name = "unix_path" - version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "af8e291873ae77c4c8d9c9b34d0bee68a35b048fb39c263a5155e0e353783eaf" - dependencies = [ -diff --git a/Cargo.toml b/Cargo.toml ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -175,13 +175,17 @@ path = "third_party/rust/mio-0.6.23" - - # These are used to test UniFFI functionality. We haven't figured out how we - # want to publish these yet, so they are only accessible via git. This works - # okay, but it means that their dependencies on UniFFI crates will normally - # also be the git versions. Patch them to use the published versions to avoid - # duplicate crates. - - [patch."https://github.com/mozilla/uniffi-rs.git"] --uniffi = "=0.21.0" --uniffi_bindgen = "=0.21.0" --uniffi_build = "=0.21.0" --uniffi_macros = "=0.21.0" -+uniffi = "=0.21.1" -+#uniffi_bindgen = "=0.21.1" -+uniffi_build = "=0.21.1" -+uniffi_macros = "=0.21.1" - weedle2 = "=4.0.0" -+ -+# Patched to use uniffi_version = 0.21.0 for checksums. -+[patch.crates-io.uniffi_bindgen] -+path = "third_party/rust/uniffi_bindgen" -diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml ---- a/supply-chain/audits.toml -+++ b/supply-chain/audits.toml -@@ -1469,16 +1469,22 @@ criteria = "safe-to-deploy" - delta = "0.19.6 -> 0.20.0" - - [[audits.uniffi]] - who = "Jan-Erik Rediger " - criteria = "safe-to-deploy" - delta = "0.20.0 -> 0.21.0" - notes = "Maintained by the Glean and Application Services team." - -+[[audits.uniffi]] -+who = "Mike Hommey " -+criteria = "safe-to-deploy" -+delta = "0.21.0 -> 0.21.1" -+notes = "No changes." -+ - [[audits.uniffi_bindgen]] - who = "Travis Long " - criteria = "safe-to-deploy" - version = "0.19.3" - notes = "Maintained by the Glean and Application Services teams." - - [[audits.uniffi_bindgen]] - who = "Jan-Erik Rediger " -@@ -1492,16 +1498,22 @@ criteria = "safe-to-deploy" - delta = "0.19.6 -> 0.20.0" - - [[audits.uniffi_bindgen]] - who = "Jan-Erik Rediger " - criteria = "safe-to-deploy" - delta = "0.20.0 -> 0.21.0" - notes = "Maintained by the Glean and Application Services team." - -+[[audits.uniffi_bindgen]] -+who = "Mike Hommey " -+criteria = "safe-to-deploy" -+delta = "0.21.0 -> 0.21.1" -+notes = "I authored the changes in this version." -+ - [[audits.uniffi_build]] - who = "Travis Long " - criteria = "safe-to-deploy" - version = "0.19.3" - notes = "Maintained by the Glean and Application Services teams." - - [[audits.uniffi_build]] - who = "Jan-Erik Rediger " -@@ -1515,16 +1527,28 @@ criteria = "safe-to-deploy" - delta = "0.19.6 -> 0.20.0" - - [[audits.uniffi_build]] - who = "Jan-Erik Rediger " - criteria = "safe-to-deploy" - delta = "0.20.0 -> 0.21.0" - notes = "Maintained by the Glean and Application Services team." - -+[[audits.uniffi_build]] -+who = "Mike Hommey " -+criteria = "safe-to-deploy" -+delta = "0.21.0 -> 0.21.1" -+notes = "No changes." -+ -+[[audits.uniffi_checksum_derive]] -+who = "Mike Hommey " -+criteria = "safe-to-deploy" -+version = "0.21.1" -+notes = "I authored this crate." -+ - [[audits.uniffi_macros]] - who = "Travis Long " - criteria = "safe-to-deploy" - version = "0.19.3" - notes = "Maintained by the Glean and Application Services teams." - - [[audits.uniffi_macros]] - who = "Jan-Erik Rediger " -@@ -1538,16 +1562,22 @@ criteria = "safe-to-deploy" - delta = "0.19.6 -> 0.20.0" - - [[audits.uniffi_macros]] - who = "Jan-Erik Rediger " - criteria = "safe-to-deploy" - delta = "0.20.0 -> 0.21.0" - notes = "Maintained by the Glean and Application Services team." - -+[[audits.uniffi_macros]] -+who = "Mike Hommey " -+criteria = "safe-to-deploy" -+delta = "0.21.0 -> 0.21.1" -+notes = "No changes." -+ - [[audits.uniffi_meta]] - who = "Jan-Erik Rediger " - criteria = "safe-to-deploy" - version = "0.19.6" - notes = "Maintained by the Glean and Application Services team." - - [[audits.uniffi_meta]] - who = "Perry McManis " -@@ -1555,16 +1585,22 @@ criteria = "safe-to-deploy" - delta = "0.19.6 -> 0.20.0" - - [[audits.uniffi_meta]] - who = "Jan-Erik Rediger " - criteria = "safe-to-deploy" - delta = "0.20.0 -> 0.21.0" - notes = "Maintained by the Glean and Application Services team." - -+[[audits.uniffi_meta]] -+who = "Mike Hommey " -+criteria = "safe-to-deploy" -+delta = "0.21.0 -> 0.21.1" -+notes = "I authored the changes in this version." -+ - [[audits.void]] - who = "Bobby Holley " - criteria = "safe-to-deploy" - version = "1.0.2" - notes = "Very small crate, just hosts the Void type for easier cross-crate interfacing." - - [[audits.wasm-encoder]] - who = "Ryan Hunt " -diff --git a/supply-chain/config.toml b/supply-chain/config.toml ---- a/supply-chain/config.toml -+++ b/supply-chain/config.toml -@@ -149,16 +149,20 @@ notes = "We're not shipping this and hav - [policy.storage] - audit-as-crates-io = false - notes = "This is a first-party crate which is entirely unrelated to the crates.io package of the same name." - - [policy.tabs] - audit-as-crates-io = false - notes = "This is a first-party crate, maintained by the appservices team, which is entirely unrelated to the crates.io package of the same name." - -+[policy.uniffi_bindgen] -+audit-as-crates-io = false -+notes = "This is a first-party crate, normally vendored, but currently patched in-tree until next update." -+ - [policy.viaduct] - audit-as-crates-io = false - notes = "This is a first-party crate, maintained by the appservices team, which is entirely unrelated to the crates.io package of the same name." - - [policy.webdriver] - audit-as-crates-io = false - criteria = "safe-to-run" - notes = "This is a first-party crate which is also published to crates.io. We certify audits for this crate as part of the documented release process, but that step happens after the version bump lands on central so we don't enforce it here. It's also used only for automation, so its subtree can be safe-to-run." -diff --git a/third_party/rust/uniffi/.cargo-checksum.json b/third_party/rust/uniffi/.cargo-checksum.json ---- a/third_party/rust/uniffi/.cargo-checksum.json -+++ b/third_party/rust/uniffi/.cargo-checksum.json -@@ -1,1 +1,1 @@ --{"files":{"Cargo.toml":"b7bde8b1b6bb7e1420c9c486d7562d1639fbb82a2b6459b8b3b7d15f002377d3","release.toml":"a6602545cd6eb46e44d89ce946d7954957ac00f1c955de54c736fa2cb560b1df","src/ffi/ffidefault.rs":"c7ab752fffed17c3fabb60e818ad1d093482f95dd0bdeae6871287695c583e48","src/ffi/foreignbytes.rs":"37061e2da7135576abccb86fe27b4fefc054586a040f2ca81fe9858d5649e887","src/ffi/foreigncallbacks.rs":"c0974920313ac81dd4bb28a51dd9e9ef50c8ea6d965f0bfdde58c661a4ca719f","src/ffi/mod.rs":"3fb3b74607066e0052fc91168e9473dbf82dbae562f85c33774a7f5f6b350616","src/ffi/rustbuffer.rs":"b773637d9e4651b80cd16f7a02ed75846d02ce0a9e32b718ce644cdba3a83cdd","src/ffi/rustcalls.rs":"4a85a90b0d46974ab9e80e403a1cddaa252337b227e1a672bb6fdbbca5a66259","src/lib.rs":"83614739f8c0c939b217755cfde169a85608a52ea197f63f7850e5765e2c5f97","src/panichook.rs":"9f49c7994a8e5489c1105c488bb3f8c5571bc5f813e7be90441eca15da5c9851","src/testing.rs":"f287d682a8f27465838b2aba91993c635a4dcd281d802dc12c7c75794324123f","tests/ui/proc_macro_arc.rs":"d766dffee3fe6a93522d40f44a7f15592db141fd674034fa5f016e06f510e87b","tests/ui/proc_macro_arc.stderr":"9e7d098abdd47f249ff62fe0a2ee0f8b96282ec5a3be0c48a778baab4624180f","tests/ui/version_mismatch.rs":"16ea359e5853517ee0d0704c015ae8c825533109fbefd715130d0f4a51f15898","tests/ui/version_mismatch.stderr":"aadbd8f3847f5663022d8dd75d6afa3b25dfc8abccd30b386a681f98587d4ceb"},"package":"f54af5ada67d1173457a99a7bb44a7917f63e7466764cb4714865c7a6678b830"} -\ No newline at end of file -+{"files":{"Cargo.toml":"40a5376941ee93f7d3d013862731eaced1121c852bd4df4affe1cd65bf9b68be","release.toml":"a6602545cd6eb46e44d89ce946d7954957ac00f1c955de54c736fa2cb560b1df","src/ffi/ffidefault.rs":"c7ab752fffed17c3fabb60e818ad1d093482f95dd0bdeae6871287695c583e48","src/ffi/foreignbytes.rs":"37061e2da7135576abccb86fe27b4fefc054586a040f2ca81fe9858d5649e887","src/ffi/foreigncallbacks.rs":"c0974920313ac81dd4bb28a51dd9e9ef50c8ea6d965f0bfdde58c661a4ca719f","src/ffi/mod.rs":"3fb3b74607066e0052fc91168e9473dbf82dbae562f85c33774a7f5f6b350616","src/ffi/rustbuffer.rs":"b773637d9e4651b80cd16f7a02ed75846d02ce0a9e32b718ce644cdba3a83cdd","src/ffi/rustcalls.rs":"4a85a90b0d46974ab9e80e403a1cddaa252337b227e1a672bb6fdbbca5a66259","src/lib.rs":"83614739f8c0c939b217755cfde169a85608a52ea197f63f7850e5765e2c5f97","src/panichook.rs":"9f49c7994a8e5489c1105c488bb3f8c5571bc5f813e7be90441eca15da5c9851","src/testing.rs":"f287d682a8f27465838b2aba91993c635a4dcd281d802dc12c7c75794324123f","tests/ui/proc_macro_arc.rs":"d766dffee3fe6a93522d40f44a7f15592db141fd674034fa5f016e06f510e87b","tests/ui/proc_macro_arc.stderr":"9e7d098abdd47f249ff62fe0a2ee0f8b96282ec5a3be0c48a778baab4624180f","tests/ui/version_mismatch.rs":"16ea359e5853517ee0d0704c015ae8c825533109fbefd715130d0f4a51f15898","tests/ui/version_mismatch.stderr":"aadbd8f3847f5663022d8dd75d6afa3b25dfc8abccd30b386a681f98587d4ceb"},"package":"b983553c0d1ad73547c65fa0c399aa800bee4a70ad330198e1c7a523212da5ee"} -\ No newline at end of file -diff --git a/third_party/rust/uniffi/Cargo.toml b/third_party/rust/uniffi/Cargo.toml ---- a/third_party/rust/uniffi/Cargo.toml -+++ b/third_party/rust/uniffi/Cargo.toml -@@ -7,28 +7,27 @@ - # - # If you are reading this file be aware that the original Cargo.toml - # will likely look very different (and much more reasonable). - # See Cargo.toml.orig for the original contents. - - [package] - edition = "2021" - name = "uniffi" --version = "0.21.0" -+version = "0.21.1" - authors = ["Firefox Sync Team "] - description = "a multi-language bindings generator for rust (runtime support code)" - homepage = "https://mozilla.github.io/uniffi-rs" - documentation = "https://mozilla.github.io/uniffi-rs" - keywords = [ - "ffi", - "bindgen", - ] - license = "MPL-2.0" - repository = "https://github.com/mozilla/uniffi-rs" --resolver = "2" - - [dependencies.anyhow] - version = "1" - - [dependencies.bytes] - version = "1.0" - - [dependencies.camino] -@@ -45,20 +44,20 @@ version = "1.12" - - [dependencies.paste] - version = "1.0" - - [dependencies.static_assertions] - version = "1.1.0" - - [dependencies.uniffi_bindgen] --version = "=0.21.0" -+version = "=0.21.1" - optional = true - - [dependencies.uniffi_macros] --version = "=0.21.0" -+version = "=0.21.1" - - [dev-dependencies.trybuild] - version = "1" - - [features] - builtin-bindgen = ["uniffi_bindgen"] - default = [] -diff --git a/third_party/rust/uniffi_bindgen/.cargo-checksum.json b/third_party/rust/uniffi_bindgen/.cargo-checksum.json ---- a/third_party/rust/uniffi_bindgen/.cargo-checksum.json -+++ b/third_party/rust/uniffi_bindgen/.cargo-checksum.json -@@ -1,1 +1,1 @@ --{"files":{"Cargo.lock":"5ed0714fd87076b5b5f11ca60553f12559e69794c2fec7d487a398f31a577a5f","Cargo.toml":"209b8cb7759ec813ee1e27a4b7e1d2bed2604c37d7c55578058bc7089ee9557e","askama.toml":"1a245b7803adca782837e125c49100147d2de0d5a1c949ff95e91af1701f6058","src/backend/config.rs":"4861dbf251dbb10beb1ed7e3eea7d79499a0de1cd9ce9ee8381a0e729c097dea","src/backend/declarations.rs":"12b8d6e651f84634de5cd02a47601965df7438f64f1a73f136bd89b6b5d515cf","src/backend/mod.rs":"899cd3b816d0467e35789b92ac3b8d5910f6dab98156d405db4803da8721fd36","src/backend/oracle.rs":"9e2b8a45af604a6e4952644e81f43f6aec6e0a1d03939c68b582529dd01a51e0","src/backend/types.rs":"7c49a92096a54eefd2336c48d60fe20ded9490142ab3a229a7c1a99fec14df3d","src/bindings/kotlin/gen_kotlin/callback_interface.rs":"b7fe795670830f3aa8a955c787b1127fe68313ee751013948527948fe5526b01","src/bindings/kotlin/gen_kotlin/compounds.rs":"d1e9a4237ff2ff711a3eae7a564c39e26f598c156ebfd34c0f04879e3533dd4f","src/bindings/kotlin/gen_kotlin/custom.rs":"4176f6ed5f66504f8fd981198bbfbae795dab5ef0d0281881d19b697f5560c44","src/bindings/kotlin/gen_kotlin/enum_.rs":"f85ae8dcb55c8f274139bf321af0ba237ae69894165ad6bd693d793f58af8e5e","src/bindings/kotlin/gen_kotlin/error.rs":"867f583aea5da7aabeb9b6d2544d7e52984cdea4aa008ce5f2ec941074735e1a","src/bindings/kotlin/gen_kotlin/external.rs":"1f7e91d7439891fe3c403274e35880ee4fc3a0da555510bdfa23c1ed2bbd8020","src/bindings/kotlin/gen_kotlin/miscellany.rs":"644ee5bb1f3619be5a36b2b3900af554ea38073cd054004f421e69c3cb8d50bc","src/bindings/kotlin/gen_kotlin/mod.rs":"90412e7927c284668a9eb75823c198182e58e5177d5561896c43b79367564b27","src/bindings/kotlin/gen_kotlin/object.rs":"6478a3e9d5e66186521730d0d481abd1ee4f123050ea050ac5a483842f08b003","src/bindings/kotlin/gen_kotlin/primitives.rs":"914d1f8253ed6a2937f67e8bd8f04f46aef4f22455ceb8a6caa84427adc2093e","src/bindings/kotlin/gen_kotlin/record.rs":"7961fcfbec5ebf8fc010b564ea4bd59402c919f6922898d48226d8c995569dd7","src/bindings/kotlin/mod.rs":"e68f2ea29e66ee62a56704e1e4464eea6d28bbdb52ab187bbe7a57ab3f362ea7","src/bindings/kotlin/templates/BooleanHelper.kt":"28e8a5088c8d58c9bfdbc575af8d8725060521fdd7d092684a8044b24ae567c7","src/bindings/kotlin/templates/CallbackInterfaceRuntime.kt":"6ede374b0fcbb3bcc939894e6f4729b3bec7ec7356831a60fba96ca38dc91aa8","src/bindings/kotlin/templates/CallbackInterfaceTemplate.kt":"5a704eb8c044ed22905e4d526ee3fc0b86f42fe82ac1eb4ad3758ad0552ea8c8","src/bindings/kotlin/templates/CustomTypeTemplate.kt":"5d4dacf29e89bcdcc46d155d993e6059d2df704e775dc853469310198253b231","src/bindings/kotlin/templates/DurationHelper.kt":"414a98161538a26f3a9b357353270c1f245ad6ceed99496aca7162cf473a92fd","src/bindings/kotlin/templates/EnumTemplate.kt":"ab3e2063aad3b91188db839dceb59b854a6a8b60fb35e545e270e64fee7c73fa","src/bindings/kotlin/templates/ErrorTemplate.kt":"a5ec2bdfc026838e1096dbf3301f21aa4ea22e8c93458d45bb1c8c7b9ee1fc5b","src/bindings/kotlin/templates/ExternalTypeTemplate.kt":"2097e0b830640ef18c79449ffa376d1dd35a8c4a5230e413c915f3b868aae872","src/bindings/kotlin/templates/FfiConverterTemplate.kt":"aa22962aaa9f641d48ccf44cb56d9f8a7736cbfaa01e1a1656662cfe5dd5c1d7","src/bindings/kotlin/templates/Float32Helper.kt":"662d95af3b629d143fb4d47cb7e9aa26ed28a5f3846de0341e28b0f9fb08bc25","src/bindings/kotlin/templates/Float64Helper.kt":"a77d099fa7d91e8702c1700e7949ffb6aaba9c6e8041ff48bab34b8e1fc9a0aa","src/bindings/kotlin/templates/Helpers.kt":"46c07798a26b53b06405c8bbbf86e3fcf38fadc1484ea04ce9d482defea89288","src/bindings/kotlin/templates/Int16Helper.kt":"7f83c4a48e1f3b2a59a3ca6a2662be8bc9baf3a5a748b31223cb3f51721ef249","src/bindings/kotlin/templates/Int32Helper.kt":"e02e4702175554b09fd2dd6ac3089dcd2c395f08ec60e762159566a9c9889450","src/bindings/kotlin/templates/Int64Helper.kt":"7a6fd6ca486852c89399c699935a9dfa1c32b9356d9a965cfde532581f05d9fa","src/bindings/kotlin/templates/Int8Helper.kt":"0554545494b6b9a76ce94f9c1723f8cf4230a13076feb75d620b1c9ca1ac4668","src/bindings/kotlin/templates/MapTemplate.kt":"399569d6443e8ad01e2deb95d78d8d2d15bf8eccee8be4fbe9ce4b8ebc0a6101","src/bindings/kotlin/templates/NamespaceLibraryTemplate.kt":"1eba4e77381155c2c96a6af2ef30fca881ade4957852f730fd10aa4f3d9cd3c4","src/bindings/kotlin/templates/ObjectRuntime.kt":"c11d233de41405caa55a56bcaa3bb69ce153ffa6fdff2aa218051929f5c4aeec","src/bindings/kotlin/templates/ObjectTemplate.kt":"7e32d92ec6116da9b7d7f278b15333a2fd2a82dde8c21534e3f6fe371d19f333","src/bindings/kotlin/templates/OptionalTemplate.kt":"5f9f2c1baa829ed3c9b61c3edb0f1fccf5ea3cccc052a69cf8966715d8fcf149","src/bindings/kotlin/templates/RecordTemplate.kt":"193ecdad9322fb5483b95bf2a259270a9b22ba054790794e9abb3fd219196bc5","src/bindings/kotlin/templates/RustBufferTemplate.kt":"415637f80a78c12b3d00db063c14a7ab5c61b098bdb1fc81a0be8bae9511776b","src/bindings/kotlin/templates/SequenceTemplate.kt":"786693b20c608a4f059b91df115278f5f12122b4c14a2e7ce18b6fc9b22b1296","src/bindings/kotlin/templates/StringHelper.kt":"060839663580d8199671b7c3bb3dce5e9106aa766ce2c6e0afc2d2bd788a1d83","src/bindings/kotlin/templates/TimestampHelper.kt":"353c2890f06ad6dda238e9aebb4bdff7bb838e17e46abf351ed3ff1fbc4e6580","src/bindings/kotlin/templates/TopLevelFunctionTemplate.kt":"09b8bb5ffea7075518ee657f83017d44ff0cbf584fd85676b082199139c9be09","src/bindings/kotlin/templates/Types.kt":"db7ed7384b4391a4bc1425ec3a89e0c890538ad30f5e115bae4998c059c8a21b","src/bindings/kotlin/templates/UInt16Helper.kt":"e84a1f30a5a899ba2c5db614d3f3c74f25bccf6dd99bf68b8830829332d051e9","src/bindings/kotlin/templates/UInt32Helper.kt":"7cdf08cc580046935f27ba07b53685968608a102e0a6be305111037c63d7ddf8","src/bindings/kotlin/templates/UInt64Helper.kt":"fd7baacbf3ab6202ff83edcc66e5f7beb11a10053ba66d0b49547616cc7cbe1f","src/bindings/kotlin/templates/UInt8Helper.kt":"bbf5a6d66c995aea9fe2fa9840c6bfa78b03520a09469b984f0e1d43191e453a","src/bindings/kotlin/templates/macros.kt":"eb5e0f9915b8ec9fbf3bf1a714625fbdcef7a7ee7461916e87fec872434ed3ec","src/bindings/kotlin/templates/wrapper.kt":"dd81cf28a4e07c685d29c87a4053eccb6339835cfc7fce3cf581d3d111fed4f5","src/bindings/mod.rs":"51ac55a3d505d5a88eedc83cf12623c2738277a9cd22bf3bbe05be1244de078b","src/bindings/python/gen_python/callback_interface.rs":"e3ffb8ba1aa8ac8ddcfff6554e7ec0d2d695d12955a98a04d114d2d6ca5dacc8","src/bindings/python/gen_python/compounds.rs":"e406c773c3b66368ea74973df742cdcba3014521812048f15de7c0e783eedfaf","src/bindings/python/gen_python/custom.rs":"33756f6bdafbd9b1a3a439c1cced3c83dc1fdb82b5ec235c064e69670ea6086c","src/bindings/python/gen_python/enum_.rs":"634c8406b07cbd24ea4f71cae4c971169e4989ce8019188f4bcd515bc3c77c5d","src/bindings/python/gen_python/error.rs":"d1a3b3edb91d9502064463cc3324770a1a6e0f234d6b49b5d7c43636bfe81d59","src/bindings/python/gen_python/external.rs":"8920b7a2a3b39a9647ec17cdff44308db3bfe9a582f026b060003edd76407599","src/bindings/python/gen_python/miscellany.rs":"f3898b75cf494b39662d886eb78d9cc06685650265fc8a1e87e5de67baa342ae","src/bindings/python/gen_python/mod.rs":"552de45cab20c4467bdcc774c305f298c9d7487c6b89f6786cb7ef1774ccddf6","src/bindings/python/gen_python/object.rs":"b4d3d8a935d4acd689cf1f3857d461dbab3a51c7c8bd821890198fb58ef3a63f","src/bindings/python/gen_python/primitives.rs":"928523bb91d2192d615d044f1fef3714681140562b740cf72dce3168e660e276","src/bindings/python/gen_python/record.rs":"f961dfe8dd1e5caa633754de7ecc684c2211c9b6633a5e6beb6053e60500b9f2","src/bindings/python/mod.rs":"bcf295b334b332c7fd1214ddfdaa727cfe37fed531c3862ce25906b3a70b71c7","src/bindings/python/templates/BooleanHelper.py":"d384ffeefcb5982c4875e819d06e919a295eaa9ff57735e6fef0801bb810d5c9","src/bindings/python/templates/CallbackInterfaceRuntime.py":"7ffef485fc008e2d9efcd07326102f300bd4673b4351353e9e2908355936c3d7","src/bindings/python/templates/CallbackInterfaceTemplate.py":"089b5cc1131e8c9b867c899cb649ce22eb9ba6a4addab4ebf9ba63316c394693","src/bindings/python/templates/CustomType.py":"db3309b3f944fb813d4cef47a04d67a86f824183f7e31289184683155fd985d9","src/bindings/python/templates/DurationHelper.py":"179c14dccd8cc7dc9791f896414f0b5d124ec116eb78173371bd8a0743208da1","src/bindings/python/templates/EnumTemplate.py":"825ca373286f1b3b252b8a1263e29c9e2f0d3e170ceb364bd6c28d6c4595597b","src/bindings/python/templates/ErrorTemplate.py":"b6b1b0d3fc074a7c3ba7db394c5d6cb3279b0fc0e6a331154303c2c6c907458b","src/bindings/python/templates/ExternalTemplate.py":"f582a6e872fe9f8275d33d36ffe017028ca459fe7c53aa680a2512718d0c0fda","src/bindings/python/templates/Float32Helper.py":"7dbc51889cff47ebf1600fad490849e4a87cac4fc0d1756eebd21609eb80b4a9","src/bindings/python/templates/Float64Helper.py":"ba9f334d1339b6eaedcacc1e35068939727170a684f41dec9ee04762ed98cec1","src/bindings/python/templates/Helpers.py":"68f03f651c38c810fa453e123e26f7c94b7a1f9178e0d863b985c3c8fabaa642","src/bindings/python/templates/Int16Helper.py":"60c22fb8b445841ebb3c68be11b81c9eba84a680eaa0e30770953361231da9b5","src/bindings/python/templates/Int32Helper.py":"aff0a017cf767394174e46d8c4fe5a5a704a8e6384fcc38d227634dfe7826916","src/bindings/python/templates/Int64Helper.py":"6c314b91699a6c6ad7db3ef636713bc2a0af9609c82acfd6062b0588177c0026","src/bindings/python/templates/Int8Helper.py":"a6e2d121b1a6d59886fceab3949e571aba1abc06dfede52666954bf15366fb6f","src/bindings/python/templates/MapTemplate.py":"bbe609b865010b98b38c58f2d4fcc97f2adec3e931903bf67263a5e440a84400","src/bindings/python/templates/NamespaceLibraryTemplate.py":"4726dbeb61508a71153436126bc04d03af966dca4f5b37511beb8bcfb6f1f307","src/bindings/python/templates/ObjectTemplate.py":"68302f6da6e4e80fc0cc8eb4ef2d4353d19ad3e9955112a2fabec8bf1b1293c7","src/bindings/python/templates/OptionalTemplate.py":"ab6da433370ba7c1316e266247ee1b7165bc02f6f288e40a7c68806c018e3282","src/bindings/python/templates/RecordTemplate.py":"98cef2adbc2b890e5c67257fb32a57380070988ef4112408eeca85e0b87b566b","src/bindings/python/templates/RustBufferHelper.py":"11f733051e63733c637fb19c4758cb58a40d045792028465f36891f89c7c5f36","src/bindings/python/templates/RustBufferTemplate.py":"90950cfeeb7a028aac9b65aeca897b217eddcfa165a0d59e8af037e834f34146","src/bindings/python/templates/SequenceTemplate.py":"faf2b1d5272a66258972d88c29d5b527cf9e589c8399e30f7ad5a0503133ce9b","src/bindings/python/templates/StringHelper.py":"941a7ad71d9598701efa15323df93766934583a55f4266d26db31e6b744603fc","src/bindings/python/templates/TimestampHelper.py":"b412cea69117858c05bae3210d378c6296658ed02a50e87c52c392dcb62c7892","src/bindings/python/templates/TopLevelFunctionTemplate.py":"2b2883b14f324e543cfeea5293d2a4907fa9ebe93b779da7174a58929d8b0442","src/bindings/python/templates/Types.py":"2eee78ca838f65b7e8ff8f760558c71ca80ad314aaa44efd1d1b8e13b349f1bc","src/bindings/python/templates/UInt16Helper.py":"06be5c9dacdf20e586f8236ed75cf2ca2470078fd8570843ea97c581b25bf860","src/bindings/python/templates/UInt32Helper.py":"41bb9bbf9b7be1060945e1267b1cc052585ec43696b1591f0ee779a0be0feaff","src/bindings/python/templates/UInt64Helper.py":"ba2825fc295a07292d9fb4aeebe74dabb9e6dbe505643e2347875ab12e511f31","src/bindings/python/templates/UInt8Helper.py":"dca5b3fc4a429fb233326224f85c4eccd3a7802ca9958ec309c7f197d59b4e3d","src/bindings/python/templates/macros.py":"3f02a32941e20aea15e136780c24c9695021dbcae08044c4f654f75aadcbd1e1","src/bindings/python/templates/wrapper.py":"627a6e18e72040909887261b8ad918c68104b15110df26b2205d7827c690e8c3","src/bindings/ruby/gen_ruby/mod.rs":"33ae9fc3f69e4c5b7bb6df41e53298f89934cee2bb6d7e7ea8488cefc9d06c03","src/bindings/ruby/gen_ruby/tests.rs":"7dcb86b08e643c43503f4cac6396833497f6988b004321c0067700ee29ffbf32","src/bindings/ruby/mod.rs":"f57fccdfc544210e8cc70e01e4991cee6e72d258ede9d2bb226baad24a3ef0d7","src/bindings/ruby/templates/EnumTemplate.rb":"5480edb347f5829e478d19474691babd72f37616ed846d519b5a61cb1d6cf047","src/bindings/ruby/templates/ErrorTemplate.rb":"147b2c3ff44c19624e7bf7b3a2a04b7badbba5743eaefa0d5e6c05943119c87e","src/bindings/ruby/templates/NamespaceLibraryTemplate.rb":"9b1454208bc83ef8f26aef33713d681e2284dbfea986ec0dd6c9b9c8b7d65e4a","src/bindings/ruby/templates/ObjectTemplate.rb":"c2d2fa2db62d48322b66b53888dcc6de2fc3e579a6b8d0a9f24029c18fffcbb5","src/bindings/ruby/templates/RecordTemplate.rb":"4aeff886928ca972e5dc9b799581b30c66a6f6dce446af3285dd3ed6b422dea9","src/bindings/ruby/templates/RustBufferBuilder.rb":"2ee5a4b97fe590de98ec2119b2dfe103bba75e15b5fb3c178fa51dfa662dfe2c","src/bindings/ruby/templates/RustBufferStream.rb":"ddfc38a6388bdddf8cc24bb6f1af948e4eef2d7ae2091a5130fee57cf53e5a7d","src/bindings/ruby/templates/RustBufferTemplate.rb":"8f37664f5436ba74ccdd801e16220f1b879d2fb56f51f5845b6047c92dc079f8","src/bindings/ruby/templates/TopLevelFunctionTemplate.rb":"88213e7e25bef664da939c04dd5621f438af735ffcb4d2d0c24a529538630069","src/bindings/ruby/templates/macros.rb":"d732a62291c78ccfbc3208227c1b57f6add723fad91b7e699d693e360840e1b0","src/bindings/ruby/templates/wrapper.rb":"542cdf46fb871e66089c9f008cf472cca411fe217d8c66a0a66776c35469aab5","src/bindings/swift/gen_swift/callback_interface.rs":"e331871ac6c9ac9b9533848fb6ddfcabc1e605970343cad307b6d86b72ebe96a","src/bindings/swift/gen_swift/compounds.rs":"f9e87b342f1f9a14295d87bad59d786d4c253a24d22900c2aba44816713718ae","src/bindings/swift/gen_swift/custom.rs":"45cdfa35ef7345dc353d0d2f3cebb17d726e90abdf5ef49422d6b2db65f8fd25","src/bindings/swift/gen_swift/enum_.rs":"018eea78ef85c9f8d715a5bc15c8273030d4f6ba297019949eb578c5cc6276fd","src/bindings/swift/gen_swift/error.rs":"bd95c3303e40f03a321f2cdc8e15a0251f4c7ddbc3c32c4c57eb9569db218488","src/bindings/swift/gen_swift/miscellany.rs":"66f16968f6cccc0b61c544e336a49b96218551731dcce566a176903c9afb3b57","src/bindings/swift/gen_swift/mod.rs":"1e8f98e05a5b03798c91ada854f6a4f2a0682c252143d63c16c6a06bd0419e4b","src/bindings/swift/gen_swift/object.rs":"072a44f484cc66694c57a9fa41ba50a531c9ce19738e11ce9df17cdfc007648f","src/bindings/swift/gen_swift/primitives.rs":"b37b8f3ad3aa7e769e6d465a31282e377f93cd69e4dcf39a56dc833f412ed412","src/bindings/swift/gen_swift/record.rs":"48296332960be3731b9139dc664d4b8a5d56d04cffa34dc995b62cf202b4dbfd","src/bindings/swift/mod.rs":"0ad4afd667ef17b3b577ded9a09cdaa5595afbdb24e7474c6b1e6a8e0a024593","src/bindings/swift/templates/BooleanHelper.swift":"f607928c4d598893421fe9c9f183bab2f23a877a07afeb123dbe90515249ec86","src/bindings/swift/templates/BridgingHeaderTemplate.h":"93a289e393ecdbe1bf986215c3b19d2aed7677d47f79b1833ce73cf6f8762e80","src/bindings/swift/templates/CallbackInterfaceRuntime.swift":"aac01eb4269151be9dde8c95ee8eba7e8d0841b3c2b1dbd88885f01ac64ee147","src/bindings/swift/templates/CallbackInterfaceTemplate.swift":"c9700f52e932556c59a9bfea68fc786746b7f321ff75c33d0a8c1565effaeef5","src/bindings/swift/templates/CustomType.swift":"fe6414f2ce3ea7b148742e2fecf2206d7e69935dd78d56e014aec70f4d6ad3ec","src/bindings/swift/templates/DurationHelper.swift":"bca4a6498b27fe0c877df3c7fbe148538eeda03e68d4e760a7c8a6a15f2067ff","src/bindings/swift/templates/EnumTemplate.swift":"e61bdf7949aa5a7b55a2c10c243e960f683c862e5977f06e7f5956646b4ccb49","src/bindings/swift/templates/ErrorTemplate.swift":"58fb5907d20b7a6db67b128e5f6350015278990fef5945be42477a5b5f82bb18","src/bindings/swift/templates/Float32Helper.swift":"6c1a4da059dd4c6c4392511c93fe9daf4ddeeab71e39afd122797b0e19254318","src/bindings/swift/templates/Float64Helper.swift":"f741568cdfb8e1421369a9a1dc845630a3a0e2dc2d6acf157afd80cd3ef5966f","src/bindings/swift/templates/Helpers.swift":"3cf3a5342a1ef0c7e078b0e58c32ae4437c4fb5dc41acbbd56b1128393c76602","src/bindings/swift/templates/Int16Helper.swift":"76eec2a54a65790c5959380cc9a7362b1e2e201632cccb789153c52e10c8dc4f","src/bindings/swift/templates/Int32Helper.swift":"5afc5e103bf637813fd4b77ab63e47ed38893525101a483218a339f222710061","src/bindings/swift/templates/Int64Helper.swift":"c1a6f6661ef1ad3bd00e8d0bf81adaa6539686eee2b481b046b76dbd87681adf","src/bindings/swift/templates/Int8Helper.swift":"bc46598c966e579cca22d336748c74cdce5674eaaaf75fc24e5fdaa36a43cf9c","src/bindings/swift/templates/MapTemplate.swift":"8b5a9cb41a1ad41b5566fbe3906a1449e5453289208a9fc6a611de1eb937142a","src/bindings/swift/templates/ModuleMapTemplate.modulemap":"99ad1e9bf550a21497296f9248ecd4385dd6d0b5892951d24cf990cdbf3eec2c","src/bindings/swift/templates/ObjectTemplate.swift":"98f744d7baf41e28d9184ae7e1aa9522b1bd951d507e0987879b11d7995782aa","src/bindings/swift/templates/OptionalTemplate.swift":"73f777d2df4fdf42daf0d6035436d168b0d5f0abc15153b97029bc305408f597","src/bindings/swift/templates/RecordTemplate.swift":"af0dc13b32d34254b4cfef3b74f52fd4611aa6c32e055e203414511fd3bbb00a","src/bindings/swift/templates/RustBufferTemplate.swift":"ed16f20cecd264f086c923cd92a5198f444aec99aad4d39e9012f09f530ca809","src/bindings/swift/templates/SequenceTemplate.swift":"977f1409909ff08018c0a80c1330737023b39a8f9fa9a13f5bf9ab4806cac199","src/bindings/swift/templates/StringHelper.swift":"b773c2b3a03f30338ff233881d1b0c0238831b812eff6eb9f0fafcb32ab0743a","src/bindings/swift/templates/TimestampHelper.swift":"6e22e370feae1199bff16bcc6f431decfb7700b02e6afdd84693a0c474eb045e","src/bindings/swift/templates/TopLevelFunctionTemplate.swift":"ca7fcbaa06ee31c7433fd6aa238b6c1135a843f469d9b4f37d4874d514fd80d0","src/bindings/swift/templates/Types.swift":"2f42430cb4ffba8e9b5084c0cf8790fb5bae151878134b8a21e745acf75d2b08","src/bindings/swift/templates/UInt16Helper.swift":"16adb3b50403dad114fad0b86bc220c5adc3bd987c57c290aee7c6407891dfbc","src/bindings/swift/templates/UInt32Helper.swift":"680ddd2815184f520723820f10698a089c222df0388bc0f7734c6d5234194aec","src/bindings/swift/templates/UInt64Helper.swift":"b752852162028a0c132f79f9005c47c263a4dab98833e86758cd7b467e305629","src/bindings/swift/templates/UInt8Helper.swift":"54f4821e704969eeb5c0e002b890d975a20eda3ddc3ee56169ee3c615dfa1079","src/bindings/swift/templates/macros.swift":"0744724c37419e894132b39aea4b8e1f473460583883fa37f38c787a7deea32c","src/bindings/swift/templates/wrapper.swift":"ca1af5fe47bca972c76fb8c9f52b18f727d4343204408de3dd0aae384f0a4171","src/interface/attributes.rs":"2f76377eebdd62e770bb9089885482a49a57e1f8405320bb778353f3e8974447","src/interface/callbacks.rs":"c9f4b97b21195ba2d1787f032f1daa5f4ce2fc40e014942e07e4eb37b5b95ee9","src/interface/enum_.rs":"1a7cda619a986a20fd4d0f145206aba2c500ce5dfca90d01e5324996fd68dc04","src/interface/error.rs":"f31fc0a7e41b4c8f4b81d06958fda14af6f05bfa318206098e0ec351cf4db809","src/interface/ffi.rs":"22d24e4dda327fa78c7632a6e5bbe374ecac0165acc550007feb729d8f4d6adf","src/interface/function.rs":"d6df6d8d412d7c45fe33c7337b37aeb851ae0f21834c4bd8b315aad4ca4ec309","src/interface/literal.rs":"3d2102cb47ff658f329d66d6c867b13a50e7f56535f23c1b414f857741360358","src/interface/mod.rs":"1d1993504ce61a2f578cb6fb42c79b7829a0767c20983581d631ee948819665e","src/interface/namespace.rs":"ab0f63241bb6a0a32f9fd2a1544468cb6daa1f91f6116b7246b52a4a94e4f461","src/interface/object.rs":"44836747d5d00bb40ecadb889c9a6ff32c1cbf625b5a6a337f5891f495fd92fd","src/interface/record.rs":"5859ea6c1f6c5524d1e6f3846954986710d5f74f1c6fd6324c4245b5f70013d5","src/interface/types/finder.rs":"a27f24e64b5bfc796378d1012b5e72001f0a442e8185fdc4430b106595d4b819","src/interface/types/mod.rs":"fe63c3fd233ad905af0358c5d610c85a5a57f263eb899acc756454a1029c4569","src/interface/types/resolver.rs":"7e7ce336ef77c0a6c23deea36856737a97cca9b1c3f5cd0d676fe7df6ade6480","src/lib.rs":"a41b43e3628bb6b3f725580eec255b409947945672887de87c21d5122775a245","src/macro_metadata/ci.rs":"0d6e53d2b5645dd3cc7d196bd3a32ee82c029e1adb9ae93708c27a3fa5c55a88","src/macro_metadata/extract.rs":"ec392692a4601343312f60937987fe460cfb40d2c63a6bb1531fe91903916f10","src/macro_metadata/mod.rs":"1668e6d947fd4a957f557410a8095649de6f8d7fd3eb6a403b8587280dca2d54","src/main.rs":"bbf8e9942d398387e7518533f9b9dc42bfa66156430a87a17605a80a356c0dea","src/scaffolding/mod.rs":"35ae72220843cf3cccefd96e190553e32a5f34ccc58d552fd9165faea12db260","src/scaffolding/templates/CallbackInterfaceTemplate.rs":"3c8caa2e148add8d80701894ee6904fc2d3c5c6424d6d414b36edb6f593b5023","src/scaffolding/templates/EnumTemplate.rs":"eb8802f04f1fd1c9451ad72c1195c136288fdb4e488922b24db75b2fdae65cd7","src/scaffolding/templates/ErrorTemplate.rs":"e7ca4538908a273dd7ba3834219b30fa0e537b2171144f06b6a96fbefb90cd1d","src/scaffolding/templates/ExternalTypesTemplate.rs":"8ecc805cf119abac8c5f60605f9183ee9ec8d37f9ec75bba5e18bb8b482a1abb","src/scaffolding/templates/ObjectTemplate.rs":"34de640428486e17a61ded4f42ce13d8eac3e66cc9f60196ce2575cdc0bd8df6","src/scaffolding/templates/RecordTemplate.rs":"e8d5af954f46f023a243721d6fc70aa176c3a4c0a9dd340048bfe46f3eeed783","src/scaffolding/templates/ReexportUniFFIScaffolding.rs":"559a17c8e39c473ff1effe9651f05b83d443ecd8abed13e03f2b63872d7e1593","src/scaffolding/templates/RustBuffer.rs":"ccf7521012d93c41265375c6d2e80ce861ec93b41383da83c37718386dd726f6","src/scaffolding/templates/TopLevelFunctionTemplate.rs":"35eaefb0862f25ff683d58fb0be6ad5f74bbe2fc85047273200c3a5f4c728434","src/scaffolding/templates/macros.rs":"a41c9690d411074c59fc4609f897431669b9d939625a08f5304a71a88901ba7c","src/scaffolding/templates/scaffolding_template.rs":"3589f8e8e1f9b194ff4a6245665d3a421c771dec3cc947c4264bfcd34573550e"},"package":"12cc4af3c0180c7e86c4a3acf2b6587af04ba2567b1e948993df10f421796621"} -\ No newline at end of file -+{"files":{"Cargo.lock":"3b1693f0ada97ba7e0527d763402404b39fe341da22bd45aaf057e4be3fa3234","Cargo.toml":"58662147277f1620eccd6592f83623cf71959df8326e9d700fdaac47c6e6cf35","askama.toml":"1a245b7803adca782837e125c49100147d2de0d5a1c949ff95e91af1701f6058","src/backend/config.rs":"4861dbf251dbb10beb1ed7e3eea7d79499a0de1cd9ce9ee8381a0e729c097dea","src/backend/declarations.rs":"12b8d6e651f84634de5cd02a47601965df7438f64f1a73f136bd89b6b5d515cf","src/backend/mod.rs":"899cd3b816d0467e35789b92ac3b8d5910f6dab98156d405db4803da8721fd36","src/backend/oracle.rs":"9e2b8a45af604a6e4952644e81f43f6aec6e0a1d03939c68b582529dd01a51e0","src/backend/types.rs":"7c49a92096a54eefd2336c48d60fe20ded9490142ab3a229a7c1a99fec14df3d","src/bindings/kotlin/gen_kotlin/callback_interface.rs":"b7fe795670830f3aa8a955c787b1127fe68313ee751013948527948fe5526b01","src/bindings/kotlin/gen_kotlin/compounds.rs":"d1e9a4237ff2ff711a3eae7a564c39e26f598c156ebfd34c0f04879e3533dd4f","src/bindings/kotlin/gen_kotlin/custom.rs":"4176f6ed5f66504f8fd981198bbfbae795dab5ef0d0281881d19b697f5560c44","src/bindings/kotlin/gen_kotlin/enum_.rs":"f85ae8dcb55c8f274139bf321af0ba237ae69894165ad6bd693d793f58af8e5e","src/bindings/kotlin/gen_kotlin/error.rs":"867f583aea5da7aabeb9b6d2544d7e52984cdea4aa008ce5f2ec941074735e1a","src/bindings/kotlin/gen_kotlin/external.rs":"1f7e91d7439891fe3c403274e35880ee4fc3a0da555510bdfa23c1ed2bbd8020","src/bindings/kotlin/gen_kotlin/miscellany.rs":"644ee5bb1f3619be5a36b2b3900af554ea38073cd054004f421e69c3cb8d50bc","src/bindings/kotlin/gen_kotlin/mod.rs":"90412e7927c284668a9eb75823c198182e58e5177d5561896c43b79367564b27","src/bindings/kotlin/gen_kotlin/object.rs":"6478a3e9d5e66186521730d0d481abd1ee4f123050ea050ac5a483842f08b003","src/bindings/kotlin/gen_kotlin/primitives.rs":"914d1f8253ed6a2937f67e8bd8f04f46aef4f22455ceb8a6caa84427adc2093e","src/bindings/kotlin/gen_kotlin/record.rs":"7961fcfbec5ebf8fc010b564ea4bd59402c919f6922898d48226d8c995569dd7","src/bindings/kotlin/mod.rs":"e68f2ea29e66ee62a56704e1e4464eea6d28bbdb52ab187bbe7a57ab3f362ea7","src/bindings/kotlin/templates/BooleanHelper.kt":"28e8a5088c8d58c9bfdbc575af8d8725060521fdd7d092684a8044b24ae567c7","src/bindings/kotlin/templates/CallbackInterfaceRuntime.kt":"6ede374b0fcbb3bcc939894e6f4729b3bec7ec7356831a60fba96ca38dc91aa8","src/bindings/kotlin/templates/CallbackInterfaceTemplate.kt":"5a704eb8c044ed22905e4d526ee3fc0b86f42fe82ac1eb4ad3758ad0552ea8c8","src/bindings/kotlin/templates/CustomTypeTemplate.kt":"5d4dacf29e89bcdcc46d155d993e6059d2df704e775dc853469310198253b231","src/bindings/kotlin/templates/DurationHelper.kt":"414a98161538a26f3a9b357353270c1f245ad6ceed99496aca7162cf473a92fd","src/bindings/kotlin/templates/EnumTemplate.kt":"ab3e2063aad3b91188db839dceb59b854a6a8b60fb35e545e270e64fee7c73fa","src/bindings/kotlin/templates/ErrorTemplate.kt":"a5ec2bdfc026838e1096dbf3301f21aa4ea22e8c93458d45bb1c8c7b9ee1fc5b","src/bindings/kotlin/templates/ExternalTypeTemplate.kt":"2097e0b830640ef18c79449ffa376d1dd35a8c4a5230e413c915f3b868aae872","src/bindings/kotlin/templates/FfiConverterTemplate.kt":"aa22962aaa9f641d48ccf44cb56d9f8a7736cbfaa01e1a1656662cfe5dd5c1d7","src/bindings/kotlin/templates/Float32Helper.kt":"662d95af3b629d143fb4d47cb7e9aa26ed28a5f3846de0341e28b0f9fb08bc25","src/bindings/kotlin/templates/Float64Helper.kt":"a77d099fa7d91e8702c1700e7949ffb6aaba9c6e8041ff48bab34b8e1fc9a0aa","src/bindings/kotlin/templates/Helpers.kt":"46c07798a26b53b06405c8bbbf86e3fcf38fadc1484ea04ce9d482defea89288","src/bindings/kotlin/templates/Int16Helper.kt":"7f83c4a48e1f3b2a59a3ca6a2662be8bc9baf3a5a748b31223cb3f51721ef249","src/bindings/kotlin/templates/Int32Helper.kt":"e02e4702175554b09fd2dd6ac3089dcd2c395f08ec60e762159566a9c9889450","src/bindings/kotlin/templates/Int64Helper.kt":"7a6fd6ca486852c89399c699935a9dfa1c32b9356d9a965cfde532581f05d9fa","src/bindings/kotlin/templates/Int8Helper.kt":"0554545494b6b9a76ce94f9c1723f8cf4230a13076feb75d620b1c9ca1ac4668","src/bindings/kotlin/templates/MapTemplate.kt":"399569d6443e8ad01e2deb95d78d8d2d15bf8eccee8be4fbe9ce4b8ebc0a6101","src/bindings/kotlin/templates/NamespaceLibraryTemplate.kt":"1eba4e77381155c2c96a6af2ef30fca881ade4957852f730fd10aa4f3d9cd3c4","src/bindings/kotlin/templates/ObjectRuntime.kt":"c11d233de41405caa55a56bcaa3bb69ce153ffa6fdff2aa218051929f5c4aeec","src/bindings/kotlin/templates/ObjectTemplate.kt":"7e32d92ec6116da9b7d7f278b15333a2fd2a82dde8c21534e3f6fe371d19f333","src/bindings/kotlin/templates/OptionalTemplate.kt":"5f9f2c1baa829ed3c9b61c3edb0f1fccf5ea3cccc052a69cf8966715d8fcf149","src/bindings/kotlin/templates/RecordTemplate.kt":"193ecdad9322fb5483b95bf2a259270a9b22ba054790794e9abb3fd219196bc5","src/bindings/kotlin/templates/RustBufferTemplate.kt":"415637f80a78c12b3d00db063c14a7ab5c61b098bdb1fc81a0be8bae9511776b","src/bindings/kotlin/templates/SequenceTemplate.kt":"786693b20c608a4f059b91df115278f5f12122b4c14a2e7ce18b6fc9b22b1296","src/bindings/kotlin/templates/StringHelper.kt":"060839663580d8199671b7c3bb3dce5e9106aa766ce2c6e0afc2d2bd788a1d83","src/bindings/kotlin/templates/TimestampHelper.kt":"353c2890f06ad6dda238e9aebb4bdff7bb838e17e46abf351ed3ff1fbc4e6580","src/bindings/kotlin/templates/TopLevelFunctionTemplate.kt":"09b8bb5ffea7075518ee657f83017d44ff0cbf584fd85676b082199139c9be09","src/bindings/kotlin/templates/Types.kt":"db7ed7384b4391a4bc1425ec3a89e0c890538ad30f5e115bae4998c059c8a21b","src/bindings/kotlin/templates/UInt16Helper.kt":"e84a1f30a5a899ba2c5db614d3f3c74f25bccf6dd99bf68b8830829332d051e9","src/bindings/kotlin/templates/UInt32Helper.kt":"7cdf08cc580046935f27ba07b53685968608a102e0a6be305111037c63d7ddf8","src/bindings/kotlin/templates/UInt64Helper.kt":"fd7baacbf3ab6202ff83edcc66e5f7beb11a10053ba66d0b49547616cc7cbe1f","src/bindings/kotlin/templates/UInt8Helper.kt":"bbf5a6d66c995aea9fe2fa9840c6bfa78b03520a09469b984f0e1d43191e453a","src/bindings/kotlin/templates/macros.kt":"eb5e0f9915b8ec9fbf3bf1a714625fbdcef7a7ee7461916e87fec872434ed3ec","src/bindings/kotlin/templates/wrapper.kt":"dd81cf28a4e07c685d29c87a4053eccb6339835cfc7fce3cf581d3d111fed4f5","src/bindings/mod.rs":"51ac55a3d505d5a88eedc83cf12623c2738277a9cd22bf3bbe05be1244de078b","src/bindings/python/gen_python/callback_interface.rs":"e3ffb8ba1aa8ac8ddcfff6554e7ec0d2d695d12955a98a04d114d2d6ca5dacc8","src/bindings/python/gen_python/compounds.rs":"e406c773c3b66368ea74973df742cdcba3014521812048f15de7c0e783eedfaf","src/bindings/python/gen_python/custom.rs":"33756f6bdafbd9b1a3a439c1cced3c83dc1fdb82b5ec235c064e69670ea6086c","src/bindings/python/gen_python/enum_.rs":"634c8406b07cbd24ea4f71cae4c971169e4989ce8019188f4bcd515bc3c77c5d","src/bindings/python/gen_python/error.rs":"d1a3b3edb91d9502064463cc3324770a1a6e0f234d6b49b5d7c43636bfe81d59","src/bindings/python/gen_python/external.rs":"8920b7a2a3b39a9647ec17cdff44308db3bfe9a582f026b060003edd76407599","src/bindings/python/gen_python/miscellany.rs":"f3898b75cf494b39662d886eb78d9cc06685650265fc8a1e87e5de67baa342ae","src/bindings/python/gen_python/mod.rs":"552de45cab20c4467bdcc774c305f298c9d7487c6b89f6786cb7ef1774ccddf6","src/bindings/python/gen_python/object.rs":"b4d3d8a935d4acd689cf1f3857d461dbab3a51c7c8bd821890198fb58ef3a63f","src/bindings/python/gen_python/primitives.rs":"928523bb91d2192d615d044f1fef3714681140562b740cf72dce3168e660e276","src/bindings/python/gen_python/record.rs":"f961dfe8dd1e5caa633754de7ecc684c2211c9b6633a5e6beb6053e60500b9f2","src/bindings/python/mod.rs":"bcf295b334b332c7fd1214ddfdaa727cfe37fed531c3862ce25906b3a70b71c7","src/bindings/python/templates/BooleanHelper.py":"d384ffeefcb5982c4875e819d06e919a295eaa9ff57735e6fef0801bb810d5c9","src/bindings/python/templates/CallbackInterfaceRuntime.py":"7ffef485fc008e2d9efcd07326102f300bd4673b4351353e9e2908355936c3d7","src/bindings/python/templates/CallbackInterfaceTemplate.py":"089b5cc1131e8c9b867c899cb649ce22eb9ba6a4addab4ebf9ba63316c394693","src/bindings/python/templates/CustomType.py":"db3309b3f944fb813d4cef47a04d67a86f824183f7e31289184683155fd985d9","src/bindings/python/templates/DurationHelper.py":"179c14dccd8cc7dc9791f896414f0b5d124ec116eb78173371bd8a0743208da1","src/bindings/python/templates/EnumTemplate.py":"825ca373286f1b3b252b8a1263e29c9e2f0d3e170ceb364bd6c28d6c4595597b","src/bindings/python/templates/ErrorTemplate.py":"b6b1b0d3fc074a7c3ba7db394c5d6cb3279b0fc0e6a331154303c2c6c907458b","src/bindings/python/templates/ExternalTemplate.py":"f582a6e872fe9f8275d33d36ffe017028ca459fe7c53aa680a2512718d0c0fda","src/bindings/python/templates/Float32Helper.py":"7dbc51889cff47ebf1600fad490849e4a87cac4fc0d1756eebd21609eb80b4a9","src/bindings/python/templates/Float64Helper.py":"ba9f334d1339b6eaedcacc1e35068939727170a684f41dec9ee04762ed98cec1","src/bindings/python/templates/Helpers.py":"68f03f651c38c810fa453e123e26f7c94b7a1f9178e0d863b985c3c8fabaa642","src/bindings/python/templates/Int16Helper.py":"60c22fb8b445841ebb3c68be11b81c9eba84a680eaa0e30770953361231da9b5","src/bindings/python/templates/Int32Helper.py":"aff0a017cf767394174e46d8c4fe5a5a704a8e6384fcc38d227634dfe7826916","src/bindings/python/templates/Int64Helper.py":"6c314b91699a6c6ad7db3ef636713bc2a0af9609c82acfd6062b0588177c0026","src/bindings/python/templates/Int8Helper.py":"a6e2d121b1a6d59886fceab3949e571aba1abc06dfede52666954bf15366fb6f","src/bindings/python/templates/MapTemplate.py":"bbe609b865010b98b38c58f2d4fcc97f2adec3e931903bf67263a5e440a84400","src/bindings/python/templates/NamespaceLibraryTemplate.py":"4726dbeb61508a71153436126bc04d03af966dca4f5b37511beb8bcfb6f1f307","src/bindings/python/templates/ObjectTemplate.py":"68302f6da6e4e80fc0cc8eb4ef2d4353d19ad3e9955112a2fabec8bf1b1293c7","src/bindings/python/templates/OptionalTemplate.py":"ab6da433370ba7c1316e266247ee1b7165bc02f6f288e40a7c68806c018e3282","src/bindings/python/templates/RecordTemplate.py":"98cef2adbc2b890e5c67257fb32a57380070988ef4112408eeca85e0b87b566b","src/bindings/python/templates/RustBufferHelper.py":"11f733051e63733c637fb19c4758cb58a40d045792028465f36891f89c7c5f36","src/bindings/python/templates/RustBufferTemplate.py":"90950cfeeb7a028aac9b65aeca897b217eddcfa165a0d59e8af037e834f34146","src/bindings/python/templates/SequenceTemplate.py":"faf2b1d5272a66258972d88c29d5b527cf9e589c8399e30f7ad5a0503133ce9b","src/bindings/python/templates/StringHelper.py":"941a7ad71d9598701efa15323df93766934583a55f4266d26db31e6b744603fc","src/bindings/python/templates/TimestampHelper.py":"b412cea69117858c05bae3210d378c6296658ed02a50e87c52c392dcb62c7892","src/bindings/python/templates/TopLevelFunctionTemplate.py":"2b2883b14f324e543cfeea5293d2a4907fa9ebe93b779da7174a58929d8b0442","src/bindings/python/templates/Types.py":"2eee78ca838f65b7e8ff8f760558c71ca80ad314aaa44efd1d1b8e13b349f1bc","src/bindings/python/templates/UInt16Helper.py":"06be5c9dacdf20e586f8236ed75cf2ca2470078fd8570843ea97c581b25bf860","src/bindings/python/templates/UInt32Helper.py":"41bb9bbf9b7be1060945e1267b1cc052585ec43696b1591f0ee779a0be0feaff","src/bindings/python/templates/UInt64Helper.py":"ba2825fc295a07292d9fb4aeebe74dabb9e6dbe505643e2347875ab12e511f31","src/bindings/python/templates/UInt8Helper.py":"dca5b3fc4a429fb233326224f85c4eccd3a7802ca9958ec309c7f197d59b4e3d","src/bindings/python/templates/macros.py":"3f02a32941e20aea15e136780c24c9695021dbcae08044c4f654f75aadcbd1e1","src/bindings/python/templates/wrapper.py":"627a6e18e72040909887261b8ad918c68104b15110df26b2205d7827c690e8c3","src/bindings/ruby/gen_ruby/mod.rs":"33ae9fc3f69e4c5b7bb6df41e53298f89934cee2bb6d7e7ea8488cefc9d06c03","src/bindings/ruby/gen_ruby/tests.rs":"7dcb86b08e643c43503f4cac6396833497f6988b004321c0067700ee29ffbf32","src/bindings/ruby/mod.rs":"f57fccdfc544210e8cc70e01e4991cee6e72d258ede9d2bb226baad24a3ef0d7","src/bindings/ruby/templates/EnumTemplate.rb":"5480edb347f5829e478d19474691babd72f37616ed846d519b5a61cb1d6cf047","src/bindings/ruby/templates/ErrorTemplate.rb":"147b2c3ff44c19624e7bf7b3a2a04b7badbba5743eaefa0d5e6c05943119c87e","src/bindings/ruby/templates/NamespaceLibraryTemplate.rb":"9b1454208bc83ef8f26aef33713d681e2284dbfea986ec0dd6c9b9c8b7d65e4a","src/bindings/ruby/templates/ObjectTemplate.rb":"c2d2fa2db62d48322b66b53888dcc6de2fc3e579a6b8d0a9f24029c18fffcbb5","src/bindings/ruby/templates/RecordTemplate.rb":"4aeff886928ca972e5dc9b799581b30c66a6f6dce446af3285dd3ed6b422dea9","src/bindings/ruby/templates/RustBufferBuilder.rb":"2ee5a4b97fe590de98ec2119b2dfe103bba75e15b5fb3c178fa51dfa662dfe2c","src/bindings/ruby/templates/RustBufferStream.rb":"ddfc38a6388bdddf8cc24bb6f1af948e4eef2d7ae2091a5130fee57cf53e5a7d","src/bindings/ruby/templates/RustBufferTemplate.rb":"8f37664f5436ba74ccdd801e16220f1b879d2fb56f51f5845b6047c92dc079f8","src/bindings/ruby/templates/TopLevelFunctionTemplate.rb":"88213e7e25bef664da939c04dd5621f438af735ffcb4d2d0c24a529538630069","src/bindings/ruby/templates/macros.rb":"d732a62291c78ccfbc3208227c1b57f6add723fad91b7e699d693e360840e1b0","src/bindings/ruby/templates/wrapper.rb":"542cdf46fb871e66089c9f008cf472cca411fe217d8c66a0a66776c35469aab5","src/bindings/swift/gen_swift/callback_interface.rs":"e331871ac6c9ac9b9533848fb6ddfcabc1e605970343cad307b6d86b72ebe96a","src/bindings/swift/gen_swift/compounds.rs":"f9e87b342f1f9a14295d87bad59d786d4c253a24d22900c2aba44816713718ae","src/bindings/swift/gen_swift/custom.rs":"45cdfa35ef7345dc353d0d2f3cebb17d726e90abdf5ef49422d6b2db65f8fd25","src/bindings/swift/gen_swift/enum_.rs":"018eea78ef85c9f8d715a5bc15c8273030d4f6ba297019949eb578c5cc6276fd","src/bindings/swift/gen_swift/error.rs":"bd95c3303e40f03a321f2cdc8e15a0251f4c7ddbc3c32c4c57eb9569db218488","src/bindings/swift/gen_swift/miscellany.rs":"66f16968f6cccc0b61c544e336a49b96218551731dcce566a176903c9afb3b57","src/bindings/swift/gen_swift/mod.rs":"1e8f98e05a5b03798c91ada854f6a4f2a0682c252143d63c16c6a06bd0419e4b","src/bindings/swift/gen_swift/object.rs":"072a44f484cc66694c57a9fa41ba50a531c9ce19738e11ce9df17cdfc007648f","src/bindings/swift/gen_swift/primitives.rs":"b37b8f3ad3aa7e769e6d465a31282e377f93cd69e4dcf39a56dc833f412ed412","src/bindings/swift/gen_swift/record.rs":"48296332960be3731b9139dc664d4b8a5d56d04cffa34dc995b62cf202b4dbfd","src/bindings/swift/mod.rs":"0ad4afd667ef17b3b577ded9a09cdaa5595afbdb24e7474c6b1e6a8e0a024593","src/bindings/swift/templates/BooleanHelper.swift":"f607928c4d598893421fe9c9f183bab2f23a877a07afeb123dbe90515249ec86","src/bindings/swift/templates/BridgingHeaderTemplate.h":"93a289e393ecdbe1bf986215c3b19d2aed7677d47f79b1833ce73cf6f8762e80","src/bindings/swift/templates/CallbackInterfaceRuntime.swift":"aac01eb4269151be9dde8c95ee8eba7e8d0841b3c2b1dbd88885f01ac64ee147","src/bindings/swift/templates/CallbackInterfaceTemplate.swift":"c9700f52e932556c59a9bfea68fc786746b7f321ff75c33d0a8c1565effaeef5","src/bindings/swift/templates/CustomType.swift":"fe6414f2ce3ea7b148742e2fecf2206d7e69935dd78d56e014aec70f4d6ad3ec","src/bindings/swift/templates/DurationHelper.swift":"bca4a6498b27fe0c877df3c7fbe148538eeda03e68d4e760a7c8a6a15f2067ff","src/bindings/swift/templates/EnumTemplate.swift":"e61bdf7949aa5a7b55a2c10c243e960f683c862e5977f06e7f5956646b4ccb49","src/bindings/swift/templates/ErrorTemplate.swift":"58fb5907d20b7a6db67b128e5f6350015278990fef5945be42477a5b5f82bb18","src/bindings/swift/templates/Float32Helper.swift":"6c1a4da059dd4c6c4392511c93fe9daf4ddeeab71e39afd122797b0e19254318","src/bindings/swift/templates/Float64Helper.swift":"f741568cdfb8e1421369a9a1dc845630a3a0e2dc2d6acf157afd80cd3ef5966f","src/bindings/swift/templates/Helpers.swift":"3cf3a5342a1ef0c7e078b0e58c32ae4437c4fb5dc41acbbd56b1128393c76602","src/bindings/swift/templates/Int16Helper.swift":"76eec2a54a65790c5959380cc9a7362b1e2e201632cccb789153c52e10c8dc4f","src/bindings/swift/templates/Int32Helper.swift":"5afc5e103bf637813fd4b77ab63e47ed38893525101a483218a339f222710061","src/bindings/swift/templates/Int64Helper.swift":"c1a6f6661ef1ad3bd00e8d0bf81adaa6539686eee2b481b046b76dbd87681adf","src/bindings/swift/templates/Int8Helper.swift":"bc46598c966e579cca22d336748c74cdce5674eaaaf75fc24e5fdaa36a43cf9c","src/bindings/swift/templates/MapTemplate.swift":"8b5a9cb41a1ad41b5566fbe3906a1449e5453289208a9fc6a611de1eb937142a","src/bindings/swift/templates/ModuleMapTemplate.modulemap":"99ad1e9bf550a21497296f9248ecd4385dd6d0b5892951d24cf990cdbf3eec2c","src/bindings/swift/templates/ObjectTemplate.swift":"98f744d7baf41e28d9184ae7e1aa9522b1bd951d507e0987879b11d7995782aa","src/bindings/swift/templates/OptionalTemplate.swift":"73f777d2df4fdf42daf0d6035436d168b0d5f0abc15153b97029bc305408f597","src/bindings/swift/templates/RecordTemplate.swift":"af0dc13b32d34254b4cfef3b74f52fd4611aa6c32e055e203414511fd3bbb00a","src/bindings/swift/templates/RustBufferTemplate.swift":"ed16f20cecd264f086c923cd92a5198f444aec99aad4d39e9012f09f530ca809","src/bindings/swift/templates/SequenceTemplate.swift":"977f1409909ff08018c0a80c1330737023b39a8f9fa9a13f5bf9ab4806cac199","src/bindings/swift/templates/StringHelper.swift":"b773c2b3a03f30338ff233881d1b0c0238831b812eff6eb9f0fafcb32ab0743a","src/bindings/swift/templates/TimestampHelper.swift":"6e22e370feae1199bff16bcc6f431decfb7700b02e6afdd84693a0c474eb045e","src/bindings/swift/templates/TopLevelFunctionTemplate.swift":"ca7fcbaa06ee31c7433fd6aa238b6c1135a843f469d9b4f37d4874d514fd80d0","src/bindings/swift/templates/Types.swift":"2f42430cb4ffba8e9b5084c0cf8790fb5bae151878134b8a21e745acf75d2b08","src/bindings/swift/templates/UInt16Helper.swift":"16adb3b50403dad114fad0b86bc220c5adc3bd987c57c290aee7c6407891dfbc","src/bindings/swift/templates/UInt32Helper.swift":"680ddd2815184f520723820f10698a089c222df0388bc0f7734c6d5234194aec","src/bindings/swift/templates/UInt64Helper.swift":"b752852162028a0c132f79f9005c47c263a4dab98833e86758cd7b467e305629","src/bindings/swift/templates/UInt8Helper.swift":"54f4821e704969eeb5c0e002b890d975a20eda3ddc3ee56169ee3c615dfa1079","src/bindings/swift/templates/macros.swift":"0744724c37419e894132b39aea4b8e1f473460583883fa37f38c787a7deea32c","src/bindings/swift/templates/wrapper.swift":"ca1af5fe47bca972c76fb8c9f52b18f727d4343204408de3dd0aae384f0a4171","src/interface/attributes.rs":"6c062b60deb332fbb76e70bc675e65c2bc3f2060fad7cec87492609fa9ce166c","src/interface/callbacks.rs":"e311fe8c80fae1d84c1e867a3c36a47a6d6a41847bb2d633edefac7c69402c84","src/interface/enum_.rs":"4ff34ff12c19be0bc9d807020fd4c8e20660c418741e68408671a18165e4b95b","src/interface/error.rs":"85a61e5bb38b369b60110928a78dc84ae77a06d0cbae4dfe9ff9dff2b8c27e5a","src/interface/ffi.rs":"22d24e4dda327fa78c7632a6e5bbe374ecac0165acc550007feb729d8f4d6adf","src/interface/function.rs":"19219c6c984d4117362ee5c269712ec2ad462476902442062ef2a3b0619b014c","src/interface/literal.rs":"d93d168176ba2824d26c490396f4baffc1d418c3c94e4a1ef0ceb3cfca16a239","src/interface/mod.rs":"88dd169859004da79bd1488e6432bc7dae8b6cba9238cab1d676e570dad31d62","src/interface/namespace.rs":"ab0f63241bb6a0a32f9fd2a1544468cb6daa1f91f6116b7246b52a4a94e4f461","src/interface/object.rs":"106cbf5ec2a684700dd99c9748ba161320abb2cecec3c5022d5dd1a9ec4f5b85","src/interface/record.rs":"5b9db093c0c90f5c757e09e6c9afee6b99e2e724c7b388924990b1a6f46357e9","src/interface/types/finder.rs":"a27f24e64b5bfc796378d1012b5e72001f0a442e8185fdc4430b106595d4b819","src/interface/types/mod.rs":"25a598fd206975cc1e62aaa269b461654c913ad6c0b6a2719c486acfcc68b45b","src/interface/types/resolver.rs":"7e7ce336ef77c0a6c23deea36856737a97cca9b1c3f5cd0d676fe7df6ade6480","src/lib.rs":"a41b43e3628bb6b3f725580eec255b409947945672887de87c21d5122775a245","src/macro_metadata/ci.rs":"0d6e53d2b5645dd3cc7d196bd3a32ee82c029e1adb9ae93708c27a3fa5c55a88","src/macro_metadata/extract.rs":"ec392692a4601343312f60937987fe460cfb40d2c63a6bb1531fe91903916f10","src/macro_metadata/mod.rs":"1668e6d947fd4a957f557410a8095649de6f8d7fd3eb6a403b8587280dca2d54","src/main.rs":"bbf8e9942d398387e7518533f9b9dc42bfa66156430a87a17605a80a356c0dea","src/scaffolding/mod.rs":"35ae72220843cf3cccefd96e190553e32a5f34ccc58d552fd9165faea12db260","src/scaffolding/templates/CallbackInterfaceTemplate.rs":"3c8caa2e148add8d80701894ee6904fc2d3c5c6424d6d414b36edb6f593b5023","src/scaffolding/templates/EnumTemplate.rs":"eb8802f04f1fd1c9451ad72c1195c136288fdb4e488922b24db75b2fdae65cd7","src/scaffolding/templates/ErrorTemplate.rs":"e7ca4538908a273dd7ba3834219b30fa0e537b2171144f06b6a96fbefb90cd1d","src/scaffolding/templates/ExternalTypesTemplate.rs":"8ecc805cf119abac8c5f60605f9183ee9ec8d37f9ec75bba5e18bb8b482a1abb","src/scaffolding/templates/ObjectTemplate.rs":"34de640428486e17a61ded4f42ce13d8eac3e66cc9f60196ce2575cdc0bd8df6","src/scaffolding/templates/RecordTemplate.rs":"e8d5af954f46f023a243721d6fc70aa176c3a4c0a9dd340048bfe46f3eeed783","src/scaffolding/templates/ReexportUniFFIScaffolding.rs":"559a17c8e39c473ff1effe9651f05b83d443ecd8abed13e03f2b63872d7e1593","src/scaffolding/templates/RustBuffer.rs":"ccf7521012d93c41265375c6d2e80ce861ec93b41383da83c37718386dd726f6","src/scaffolding/templates/TopLevelFunctionTemplate.rs":"35eaefb0862f25ff683d58fb0be6ad5f74bbe2fc85047273200c3a5f4c728434","src/scaffolding/templates/macros.rs":"a41c9690d411074c59fc4609f897431669b9d939625a08f5304a71a88901ba7c","src/scaffolding/templates/scaffolding_template.rs":"3589f8e8e1f9b194ff4a6245665d3a421c771dec3cc947c4264bfcd34573550e"},"package":"5d46080a4840abccf7c0cce21931dae53215cbd7dd969b5e63c486235ce91a2a"} -\ No newline at end of file -diff --git a/third_party/rust/uniffi_bindgen/Cargo.lock b/third_party/rust/uniffi_bindgen/Cargo.lock ---- a/third_party/rust/uniffi_bindgen/Cargo.lock -+++ b/third_party/rust/uniffi_bindgen/Cargo.lock -@@ -1,17 +1,17 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. - version = 3 - - [[package]] - name = "anyhow" --version = "1.0.65" -+version = "1.0.66" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" -+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" - - [[package]] - name = "askama" - version = "0.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139" - dependencies = [ - "askama_derive", -@@ -94,19 +94,19 @@ checksum = "88ad0e1e3e88dd237a156ab9f571 - [[package]] - name = "cfg-if" - version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "clap" --version = "3.2.22" -+version = "3.2.23" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" -+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" - dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim", -@@ -133,19 +133,19 @@ version = "0.2.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" - dependencies = [ - "os_str_bytes", - ] - - [[package]] - name = "fs-err" --version = "2.8.1" -+version = "2.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50" -+checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" - - [[package]] - name = "goblin" - version = "0.5.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" - dependencies = [ - "log", -@@ -171,35 +171,35 @@ version = "0.1.19" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" - dependencies = [ - "libc", - ] - - [[package]] - name = "indexmap" --version = "1.9.1" -+version = "1.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" - dependencies = [ - "autocfg", - "hashbrown", - ] - - [[package]] - name = "itoa" - version = "1.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - - [[package]] - name = "libc" --version = "0.2.135" -+version = "0.2.138" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" -+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" - - [[package]] - name = "log" - version = "0.4.17" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" - dependencies = [ - "cfg-if", -@@ -240,31 +240,31 @@ source = "registry+https://github.com/ru - checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" - dependencies = [ - "memchr", - "minimal-lexical", - ] - - [[package]] - name = "once_cell" --version = "1.15.0" -+version = "1.16.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" -+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - - [[package]] - name = "os_str_bytes" --version = "6.3.0" -+version = "6.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" -+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - - [[package]] - name = "paste" --version = "1.0.9" -+version = "1.0.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" -+checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b" - - [[package]] - name = "plain" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - - [[package]] -@@ -288,19 +288,19 @@ checksum = "a1be40180e52ecc98ad80b184934 - dependencies = [ - "proc-macro2", - "quote", - "version_check", - ] - - [[package]] - name = "proc-macro2" --version = "1.0.46" -+version = "1.0.47" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" -+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" - dependencies = [ - "unicode-ident", - ] - - [[package]] - name = "quote" - version = "1.0.21" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -332,56 +332,62 @@ checksum = "bdbda6ac5cd1321e724fa9cee216 - dependencies = [ - "proc-macro2", - "quote", - "syn", - ] - - [[package]] - name = "serde" --version = "1.0.145" -+version = "1.0.150" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" -+checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.145" -+version = "1.0.150" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" -+checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" - dependencies = [ - "proc-macro2", - "quote", - "syn", - ] - - [[package]] - name = "serde_json" --version = "1.0.86" -+version = "1.0.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" -+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" - dependencies = [ - "itoa", - "ryu", - "serde", - ] - - [[package]] -+name = "siphasher" -+version = "0.3.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -+ -+[[package]] - name = "strsim" - version = "0.10.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - - [[package]] - name = "syn" --version = "1.0.102" -+version = "1.0.105" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" -+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" - dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", - ] - - [[package]] - name = "termcolor" -@@ -389,25 +395,25 @@ version = "1.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" - dependencies = [ - "winapi-util", - ] - - [[package]] - name = "textwrap" --version = "0.15.1" -+version = "0.16.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" -+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - - [[package]] - name = "toml" --version = "0.5.9" -+version = "0.5.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -+checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" - dependencies = [ - "serde", - ] - - [[package]] - name = "unicase" - version = "2.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -419,17 +425,17 @@ dependencies = [ - [[package]] - name = "unicode-ident" - version = "1.0.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - - [[package]] - name = "uniffi_bindgen" --version = "0.21.0" -+version = "0.21.1" - dependencies = [ - "anyhow", - "askama", - "bincode", - "camino", - "clap", - "fs-err", - "goblin", -@@ -439,22 +445,34 @@ dependencies = [ - "serde", - "serde_json", - "toml", - "uniffi_meta", - "weedle2", - ] - - [[package]] -+name = "uniffi_checksum_derive" -+version = "0.21.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78b6e16d46caf942016997af8bbdf4b163bf8ae3deb0b667d9643de7b7ffd4c9" -+dependencies = [ -+ "quote", -+ "syn", -+] -+ -+[[package]] - name = "uniffi_meta" --version = "0.21.0" -+version = "0.21.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cd9417cc653937681436b93838d8c5f97a5b8c58697813982ee8810bd1dc3b57" -+checksum = "729835442da829c9b6f7c111c76cf87b2498e129101203bec94f0c39a3296a38" - dependencies = [ - "serde", -+ "siphasher", -+ "uniffi_checksum_derive", - ] - - [[package]] - name = "version_check" - version = "0.9.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -diff --git a/third_party/rust/uniffi_bindgen/Cargo.toml b/third_party/rust/uniffi_bindgen/Cargo.toml ---- a/third_party/rust/uniffi_bindgen/Cargo.toml -+++ b/third_party/rust/uniffi_bindgen/Cargo.toml -@@ -7,28 +7,27 @@ - # - # If you are reading this file be aware that the original Cargo.toml - # will likely look very different (and much more reasonable). - # See Cargo.toml.orig for the original contents. - - [package] - edition = "2021" - name = "uniffi_bindgen" --version = "0.21.0" -+version = "0.21.1" - authors = ["Firefox Sync Team "] - description = "a multi-language bindings generator for rust (codegen and cli tooling)" - homepage = "https://mozilla.github.io/uniffi-rs" - documentation = "https://mozilla.github.io/uniffi-rs" - keywords = [ - "ffi", - "bindgen", - ] - license = "MPL-2.0" - repository = "https://github.com/mozilla/uniffi-rs" --resolver = "2" - - [[bin]] - name = "uniffi-bindgen" - path = "src/main.rs" - - [dependencies.anyhow] - version = "1" - -@@ -71,12 +70,12 @@ version = "1" - - [dependencies.serde_json] - version = "1.0.80" - - [dependencies.toml] - version = "0.5" - - [dependencies.uniffi_meta] --version = "=0.21.0" -+version = "=0.21.1" - - [dependencies.weedle2] - version = "4.0.0" -diff --git a/third_party/rust/uniffi_bindgen/src/interface/attributes.rs b/third_party/rust/uniffi_bindgen/src/interface/attributes.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/attributes.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/attributes.rs -@@ -10,23 +10,24 @@ - //! support. You can also use the [`parse_attributes`] function to parse an - //! `ExtendedAttributeList` into a vec of same. - //! - //! We only support a small number of attributes, so it's manageable to have them - //! all handled by a single abstraction. This might need to be refactored in future - //! if we grow significantly more complicated attribute handling. - - use anyhow::{bail, Result}; -+use uniffi_meta::Checksum; - - /// Represents an attribute parsed from UDL, like `[ByRef]` or `[Throws]`. - /// - /// This is a convenience enum for parsing UDL attributes and erroring out if we encounter - /// any unsupported ones. These don't convert directly into parts of a `ComponentInterface`, but - /// may influence the properties of things like functions and arguments. --#[derive(Debug, Clone, Hash)] -+#[derive(Debug, Clone, Checksum)] - pub(super) enum Attribute { - ByRef, - Enum, - Error, - Name(String), - SelfType(SelfType), - Threadsafe, // N.B. the `[Threadsafe]` attribute is deprecated and will be removed - Throws(String), -@@ -114,17 +115,17 @@ where - validator(attr)?; - } - - Ok(attrs) - } - - /// Attributes that can be attached to an `enum` definition in the UDL. - /// There's only one case here: using `[Error]` to mark an enum as an error class. --#[derive(Debug, Clone, Hash, Default)] -+#[derive(Debug, Clone, Checksum, Default)] - pub(super) struct EnumAttributes(Vec); - - impl EnumAttributes { - pub fn contains_error_attr(&self) -> bool { - self.0.iter().any(|attr| attr.is_error()) - } - } - -@@ -150,17 +151,17 @@ impl); - - impl FunctionAttributes { - pub(super) fn get_throws_err(&self) -> Option<&str> { - self.0.iter().find_map(|attr| match attr { - // This will hopefully return a helpful compilation error - // if the error is not defined. - Attribute::Throws(inner) => Some(inner.as_ref()), -@@ -193,17 +194,17 @@ impl); - - impl ArgumentAttributes { - pub fn by_ref(&self) -> bool { - self.0.iter().any(|attr| matches!(attr, Attribute::ByRef)) - } - } - -@@ -228,17 +229,17 @@ impl Ok(Default::default()), - Some(v) => v.try_into(), - } - } - } - - /// Represents UDL attributes that might appear on an `interface` definition. --#[derive(Debug, Clone, Hash, Default)] -+#[derive(Debug, Clone, Checksum, Default)] - pub(super) struct InterfaceAttributes(Vec); - - impl InterfaceAttributes { - pub fn contains_enum_attr(&self) -> bool { - self.0.iter().any(|attr| attr.is_enum()) - } - - pub fn contains_error_attr(&self) -> bool { -@@ -282,17 +283,17 @@ impl); - - impl ConstructorAttributes { - pub(super) fn get_throws_err(&self) -> Option<&str> { - self.0.iter().find_map(|attr| match attr { - // This will hopefully return a helpful compilation error - // if the error is not defined. - Attribute::Throws(inner) => Some(inner.as_ref()), -@@ -321,17 +322,17 @@ impl TryFrom<&weedle::attribute::Extende - Ok(Self(attrs)) - } - } - - /// Represents UDL attributes that might appear on a method. - /// - /// This supports the `[Throws=ErrorName]` attribute for methods that can produce - /// an error, and the `[Self=ByArc]` attribute for methods that take `Arc` as receiver. --#[derive(Debug, Clone, Hash, Default)] -+#[derive(Debug, Clone, Checksum, Default)] - pub(super) struct MethodAttributes(Vec); - - impl MethodAttributes { - pub(super) fn get_throws_err(&self) -> Option<&str> { - self.0.iter().find_map(|attr| match attr { - // This will hopefully return a helpful compilation error - // if the error is not defined. - Attribute::Throws(inner) => Some(inner.as_ref()), -@@ -370,17 +371,17 @@ impl`. - } - - impl TryFrom<&weedle::attribute::IdentifierOrString<'_>> for SelfType { - type Error = anyhow::Error; - fn try_from(nm: &weedle::attribute::IdentifierOrString<'_>) -> Result { - Ok(match nm { -@@ -393,17 +394,17 @@ impl TryFrom<&weedle::attribute::Identif - } - }) - } - } - - /// Represents UDL attributes that might appear on a typedef - /// - /// This supports the `[External="crate_name"]` and `[Custom]` attributes for types. --#[derive(Debug, Clone, Hash, Default)] -+#[derive(Debug, Clone, Checksum, Default)] - pub(super) struct TypedefAttributes(Vec); - - impl TypedefAttributes { - pub(super) fn get_crate_name(&self) -> String { - self.0 - .iter() - .find_map(|attr| match attr { - Attribute::External(crate_name) => Some(crate_name.clone()), -diff --git a/third_party/rust/uniffi_bindgen/src/interface/callbacks.rs b/third_party/rust/uniffi_bindgen/src/interface/callbacks.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/callbacks.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/callbacks.rs -@@ -28,29 +28,35 @@ - //! # }; - //! # "##)?; - //! let callback = ci.get_callback_interface_definition("Example").unwrap(); - //! assert_eq!(callback.name(), "Example"); - //! assert_eq!(callback.methods()[0].name(), "hello"); - //! # Ok::<(), anyhow::Error>(()) - //! ``` - --use std::hash::{Hash, Hasher}; -- - use anyhow::{bail, Result}; -+use uniffi_meta::Checksum; - - use super::ffi::{FFIArgument, FFIFunction, FFIType}; - use super::object::Method; - use super::types::{Type, TypeIterator}; - use super::{APIConverter, ComponentInterface}; - --#[derive(Debug, Clone)] -+#[derive(Debug, Clone, Checksum)] - pub struct CallbackInterface { - pub(super) name: String, - pub(super) methods: Vec, -+ // We don't include the FFIFunc in the hash calculation, because: -+ // - it is entirely determined by the other fields, -+ // so excluding it is safe. -+ // - its `name` property includes a checksum derived from the very -+ // hash value we're trying to calculate here, so excluding it -+ // avoids a weird circular depenendency in the calculation. -+ #[checksum_ignore] - pub(super) ffi_init_callback: FFIFunction, - } - - impl CallbackInterface { - fn new(name: String) -> CallbackInterface { - CallbackInterface { - name, - methods: Default::default(), -@@ -83,29 +89,16 @@ impl CallbackInterface { - self.ffi_init_callback.return_type = None; - } - - pub fn iter_types(&self) -> TypeIterator<'_> { - Box::new(self.methods.iter().flat_map(Method::iter_types)) - } - } - --impl Hash for CallbackInterface { -- fn hash(&self, state: &mut H) { -- // We don't include the FFIFunc in the hash calculation, because: -- // - it is entirely determined by the other fields, -- // so excluding it is safe. -- // - its `name` property includes a checksum derived from the very -- // hash value we're trying to calculate here, so excluding it -- // avoids a weird circular depenendency in the calculation. -- self.name.hash(state); -- self.methods.hash(state); -- } --} -- - impl APIConverter for weedle::CallbackInterfaceDefinition<'_> { - fn convert(&self, ci: &mut ComponentInterface) -> Result { - if self.attributes.is_some() { - bail!("callback interface attributes are not supported yet"); - } - if self.inheritance.is_some() { - bail!("callback interface inheritence is not supported"); - } -diff --git a/third_party/rust/uniffi_bindgen/src/interface/enum_.rs b/third_party/rust/uniffi_bindgen/src/interface/enum_.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/enum_.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/enum_.rs -@@ -72,27 +72,28 @@ - //! assert_eq!(e.variants()[0].fields().len(), 0); - //! assert_eq!(e.variants()[1].name(), "One"); - //! assert_eq!(e.variants()[1].fields().len(), 1); - //! assert_eq!(e.variants()[1].fields()[0].name(), "first"); - //! # Ok::<(), anyhow::Error>(()) - //! ``` - - use anyhow::{bail, Result}; -+use uniffi_meta::Checksum; - - use super::record::Field; - use super::types::{Type, TypeIterator}; - use super::{APIConverter, ComponentInterface}; - - /// Represents an enum with named variants, each of which may have named - /// and typed fields. - /// - /// Enums are passed across the FFI by serializing to a bytebuffer, with a - /// i32 indicating the variant followed by the serialization of each field. --#[derive(Debug, Clone, Hash)] -+#[derive(Debug, Clone, Checksum)] - pub struct Enum { - pub(super) name: String, - pub(super) variants: Vec, - // "Flat" enums do not have, and will never have, variants with associated data. - pub(super) flat: bool, - } - - impl Enum { -@@ -169,17 +170,17 @@ impl APIConverter for weedle::Inte - flat: false, - }) - } - } - - /// Represents an individual variant in an Enum. - /// - /// Each variant has a name and zero or more fields. --#[derive(Debug, Clone, Default, Hash)] -+#[derive(Debug, Clone, Default, Checksum)] - pub struct Variant { - pub(super) name: String, - pub(super) fields: Vec, - } - - impl Variant { - pub fn name(&self) -> &str { - &self.name -diff --git a/third_party/rust/uniffi_bindgen/src/interface/error.rs b/third_party/rust/uniffi_bindgen/src/interface/error.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/error.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/error.rs -@@ -78,28 +78,29 @@ - //! assert_eq!(err.variants()[2].fields().len(), 2); - //! assert_eq!(err.variants()[2].fields()[0].name(), "x"); - //! assert_eq!(err.variants()[2].fields()[1].name(), "y"); - //! assert_eq!(err.is_flat(), false); - //! # Ok::<(), anyhow::Error>(()) - //! ``` - - use anyhow::Result; -+use uniffi_meta::Checksum; - - use super::enum_::{Enum, Variant}; - use super::types::{Type, TypeIterator}; - use super::{APIConverter, ComponentInterface}; - - /// Represents an Error that might be thrown by functions/methods in the component interface. - /// - /// Errors are represented in the UDL as enums with the special `[Error]` attribute, but - /// they're handled in the FFI very differently. We create them in `uniffi::call_with_result()` if - /// the wrapped function returns an `Err` value - /// struct and assign an integer error code to each variant. --#[derive(Debug, Clone, Hash)] -+#[derive(Debug, Clone, Checksum)] - pub struct Error { - pub name: String, - enum_: Enum, - } - - impl Error { - pub fn from_enum(enum_: Enum) -> Self { - Self { -diff --git a/third_party/rust/uniffi_bindgen/src/interface/function.rs b/third_party/rust/uniffi_bindgen/src/interface/function.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/function.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/function.rs -@@ -27,40 +27,47 @@ - //! # "##)?; - //! let func = ci.get_function_definition("hello").unwrap(); - //! assert_eq!(func.name(), "hello"); - //! assert!(matches!(func.return_type(), Some(Type::String))); - //! assert_eq!(func.arguments().len(), 0); - //! # Ok::<(), anyhow::Error>(()) - //! ``` - use std::convert::TryFrom; --use std::hash::{Hash, Hasher}; - - use anyhow::{bail, Result}; -+use uniffi_meta::Checksum; - - use super::ffi::{FFIArgument, FFIFunction}; - use super::literal::{convert_default_value, Literal}; - use super::types::{Type, TypeIterator}; - use super::{ - attributes::{ArgumentAttributes, FunctionAttributes}, - convert_type, - }; - use super::{APIConverter, ComponentInterface}; - - /// Represents a standalone function. - /// - /// Each `Function` corresponds to a standalone function in the rust module, - /// and has a corresponding standalone function in the foreign language bindings. - /// - /// In the FFI, this will be a standalone function with appropriately lowered types. --#[derive(Debug, Clone)] -+#[derive(Debug, Clone, Checksum)] - pub struct Function { - pub(super) name: String, - pub(super) arguments: Vec, - pub(super) return_type: Option, -+ // We don't include the FFIFunc in the hash calculation, because: -+ // - it is entirely determined by the other fields, -+ // so excluding it is safe. -+ // - its `name` property includes a checksum derived from the very -+ // hash value we're trying to calculate here, so excluding it -+ // avoids a weird circular depenendency in the calculation. -+ #[checksum_ignore] - pub(super) ffi_func: FFIFunction, - pub(super) attributes: FunctionAttributes, - } - - impl Function { - pub fn name(&self) -> &str { - &self.name - } -@@ -137,31 +144,16 @@ impl From for F - arguments, - return_type, - ffi_func, - attributes: Default::default(), - } - } - } - --impl Hash for Function { -- fn hash(&self, state: &mut H) { -- // We don't include the FFIFunc in the hash calculation, because: -- // - it is entirely determined by the other fields, -- // so excluding it is safe. -- // - its `name` property includes a checksum derived from the very -- // hash value we're trying to calculate here, so excluding it -- // avoids a weird circular depenendency in the calculation. -- self.name.hash(state); -- self.arguments.hash(state); -- self.return_type.hash(state); -- self.attributes.hash(state); -- } --} -- - impl APIConverter for weedle::namespace::NamespaceMember<'_> { - fn convert(&self, ci: &mut ComponentInterface) -> Result { - match self { - weedle::namespace::NamespaceMember::Operation(f) => f.convert(ci), - _ => bail!("no support for namespace member type {:?} yet", self), - } - } - } -@@ -180,17 +172,17 @@ impl APIConverter for weedle:: - attributes: FunctionAttributes::try_from(self.attributes.as_ref())?, - }) - } - } - - /// Represents an argument to a function/constructor/method call. - /// - /// Each argument has a name and a type, along with some optional metadata. --#[derive(Debug, Clone, Hash)] -+#[derive(Debug, Clone, Checksum)] - pub struct Argument { - pub(super) name: String, - pub(super) type_: Type, - pub(super) by_ref: bool, - pub(super) optional: bool, - pub(super) default: Option, - } - -diff --git a/third_party/rust/uniffi_bindgen/src/interface/literal.rs b/third_party/rust/uniffi_bindgen/src/interface/literal.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/literal.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/literal.rs -@@ -3,22 +3,23 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - //! # Support for literal values. - //! - //! This module provides support for interpreting literal values from the UDL, - //! which appear in places such as default arguments. - - use anyhow::{bail, Result}; -+use uniffi_meta::Checksum; - - use super::types::Type; - - // Represents a literal value. - // Used for e.g. default argument values. --#[derive(Debug, Clone, Hash)] -+#[derive(Debug, Clone, Checksum)] - pub enum Literal { - Boolean(bool), - String(String), - // Integers are represented as the widest representation we can. - // Number formatting vary with language and radix, so we avoid a lot of parsing and - // formatting duplication by using only signed and unsigned variants. - UInt(u64, Radix, Type), - Int(i64, Radix, Type), -@@ -30,17 +31,17 @@ pub enum Literal { - Enum(String, Type), - EmptySequence, - EmptyMap, - Null, - } - - // Represent the radix of integer literal values. - // We preserve the radix into the generated bindings for readability reasons. --#[derive(Debug, Clone, Copy, Hash)] -+#[derive(Debug, Clone, Copy, Checksum)] - pub enum Radix { - Decimal = 10, - Octal = 8, - Hexadecimal = 16, - } - - pub(super) fn convert_default_value( - default_value: &weedle::literal::DefaultValue<'_>, -diff --git a/third_party/rust/uniffi_bindgen/src/interface/mod.rs b/third_party/rust/uniffi_bindgen/src/interface/mod.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/mod.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/mod.rs -@@ -39,22 +39,17 @@ - //! guarantee that there's not some edge-case where it produces valid-but-incorrect code. - //! - //! * There is a *lot* of cloning going on, in the spirit of "first make it work". There's probably - //! a good opportunity here for e.g. interned strings, but we're nowhere near the point were we need - //! that kind of optimization just yet. - //! - //! * Error messages and general developer experience leave a lot to be desired. - --use std::{ -- collections::HashSet, -- convert::TryFrom, -- hash::{Hash, Hasher}, -- iter, --}; -+use std::{collections::HashSet, convert::TryFrom, iter}; - - use anyhow::{bail, Result}; - - pub mod types; - pub use types::Type; - use types::{TypeIterator, TypeUniverse}; - - mod attributes; -@@ -72,47 +67,51 @@ mod namespace; - pub use namespace::Namespace; - mod object; - pub use object::{Constructor, Method, Object}; - mod record; - pub use record::{Field, Record}; - - pub mod ffi; - pub use ffi::{FFIArgument, FFIFunction, FFIType}; --use uniffi_meta::{MethodMetadata, ObjectMetadata}; -+use uniffi_meta::{Checksum, MethodMetadata, ObjectMetadata}; - - /// The main public interface for this module, representing the complete details of an interface exposed - /// by a rust component and the details of consuming it via an extern-C FFI layer. - /// --#[derive(Debug, Default)] -+#[derive(Debug, Default, Checksum)] - pub struct ComponentInterface { - /// Every ComponentInterface gets tagged with the version of uniffi used to create it. - /// This helps us avoid using a lib compiled with one version together with bindings created - /// using a different version, which might introduce unsafety. - uniffi_version: String, - /// All of the types used in the interface. -+ // We can't checksum `self.types`, but its contents are implied by the other fields -+ // anyway, so it's safe to ignore it. -+ #[checksum_ignore] - pub(super) types: TypeUniverse, - /// The unique prefix that we'll use for namespacing when exposing this component's API. - namespace: String, - /// The internal unique prefix used to namespace FFI symbols -+ #[checksum_ignore] - ffi_namespace: String, - /// The high-level API provided by the component. - enums: Vec, - records: Vec, - functions: Vec, - objects: Vec, - callback_interfaces: Vec, - errors: Vec, - } - - impl ComponentInterface { - /// Parse a `ComponentInterface` from a string containing a WebIDL definition. - pub fn from_webidl(idl: &str) -> Result { - let mut ci = Self { -- uniffi_version: env!("CARGO_PKG_VERSION").to_string(), -+ uniffi_version: "0.21.0".to_string(), - ..Default::default() - }; - // There's some lifetime thing with the errors returned from weedle::Definitions::parse - // that my own lifetime is too short to worry about figuring out; unwrap and move on. - - // Note we use `weedle::Definitions::parse` instead of `weedle::parse` so - // on parse errors we can see how far weedle got, which helps locate the problem. - use weedle::Parse; // this trait must be in scope for parse to work. -@@ -316,26 +315,18 @@ impl ComponentInterface { - /// version of that interface. It offers the following properties: - /// - /// - Two ComponentIntefaces generated from the same WebIDL file, using the same version of uniffi - /// and the same version of Rust, will always have the same checksum value. - /// - Two ComponentInterfaces will, with high probability, have different checksum values if: - /// - They were generated from two different WebIDL files. - /// - They were generated by two different versions of uniffi - /// -- /// The checksum may or may not change depending on the version of Rust used; since we expect -- /// consumers to be using the same executable to generate both the scaffolding and the bindings, -- /// assuming the same version of Rust seems acceptable. -- /// - /// Note that this is designed to prevent accidents, not attacks, so there is no need for the - /// checksum to be cryptographically secure. -- /// -- /// TODO: it's not clear to me if the derivation of `Hash` is actually deterministic enough to -- /// ensure the guarantees above, or if it might be sensitive to e.g. compiler-driven re-ordering -- /// of struct field. Let's see how it goes... - pub fn checksum(&self) -> u16 { - uniffi_meta::checksum(self) - } - - /// The namespace to use in FFI-level function definitions. - /// - /// The value returned by this method is used as a prefix to namespace all UDL-defined FFI - /// functions used in this ComponentInterface. -@@ -667,33 +658,16 @@ impl ComponentInterface { - } - for callback in self.callback_interfaces.iter_mut() { - callback.derive_ffi_funcs(&ci_prefix); - } - Ok(()) - } - } - --/// `ComponentInterface` structs can be hashed, but this is mostly a convenient way to --/// produce a checksum of their contents. They're not really intended to live in a hashtable. --impl Hash for ComponentInterface { -- fn hash(&self, state: &mut H) { -- // We can't hash `self.types`, but its contents are implied by the other fields -- // anyway, so it's safe to ignore it. -- self.uniffi_version.hash(state); -- self.namespace.hash(state); -- self.enums.hash(state); -- self.records.hash(state); -- self.functions.hash(state); -- self.objects.hash(state); -- self.callback_interfaces.hash(state); -- self.errors.hash(state); -- } --} -- - fn get_or_insert_object<'a>(objects: &'a mut Vec, name: &str) -> &'a mut Object { - // The find-based way of writing this currently runs into a borrow checker - // error, so we use position - match objects.iter_mut().position(|o| o.name == name) { - Some(idx) => &mut objects[idx], - None => { - objects.push(Object::new(name.to_owned())); - objects.last_mut().unwrap() -diff --git a/third_party/rust/uniffi_bindgen/src/interface/object.rs b/third_party/rust/uniffi_bindgen/src/interface/object.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/object.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/object.rs -@@ -53,20 +53,20 @@ - //! # "##)?; - //! let obj = ci.get_object_definition("Example").unwrap(); - //! assert_eq!(obj.name(), "Example"); - //! assert_eq!(obj.constructors().len(), 0); - //! # Ok::<(), anyhow::Error>(()) - //! ``` - - use std::convert::TryFrom; --use std::hash::{Hash, Hasher}; - use std::{collections::HashSet, iter}; - - use anyhow::{bail, Result}; -+use uniffi_meta::Checksum; - - use super::ffi::{FFIArgument, FFIFunction, FFIType}; - use super::function::Argument; - use super::types::{Type, TypeIterator}; - use super::{ - attributes::{ConstructorAttributes, InterfaceAttributes, MethodAttributes}, - convert_type, - }; -@@ -81,22 +81,30 @@ use super::{APIConverter, ComponentInter - /// At the FFI layer, objects are represented by an opaque integer handle and a set of functions - /// a common prefix. The object's constuctors are functions that return new objects by handle, - /// and its methods are functions that take a handle as first argument. The foreign language - /// binding code is expected to stitch these functions back together into an appropriate class - /// definition (or that language's equivalent thereof). - /// - /// TODO: - /// - maybe "Class" would be a better name than "Object" here? --#[derive(Debug, Clone)] -+#[derive(Debug, Clone, Checksum)] - pub struct Object { - pub(super) name: String, - pub(super) constructors: Vec, - pub(super) methods: Vec, -+ // We don't include the FFIFunc in the hash calculation, because: -+ // - it is entirely determined by the other fields, -+ // so excluding it is safe. -+ // - its `name` property includes a checksum derived from the very -+ // hash value we're trying to calculate here, so excluding it -+ // avoids a weird circular depenendency in the calculation. -+ #[checksum_ignore] - pub(super) ffi_func_free: FFIFunction, -+ #[checksum_ignore] - pub(super) uses_deprecated_threadsafe_attribute: bool, - } - - impl Object { - pub(super) fn new(name: String) -> Object { - Object { - name, - constructors: Default::default(), -@@ -185,30 +193,16 @@ impl Object { - .iter() - .map(Method::iter_types) - .chain(self.constructors.iter().map(Constructor::iter_types)) - .flatten(), - ) - } - } - --impl Hash for Object { -- fn hash(&self, state: &mut H) { -- // We don't include the FFIFunc in the hash calculation, because: -- // - it is entirely determined by the other fields, -- // so excluding it is safe. -- // - its `name` property includes a checksum derived from the very -- // hash value we're trying to calculate here, so excluding it -- // avoids a weird circular depenendency in the calculation. -- self.name.hash(state); -- self.constructors.hash(state); -- self.methods.hash(state); -- } --} -- - impl APIConverter for weedle::InterfaceDefinition<'_> { - fn convert(&self, ci: &mut ComponentInterface) -> Result { - if self.inheritance.is_some() { - bail!("interface inheritence is not supported"); - } - let mut object = Object::new(self.identifier.0.to_string()); - let attributes = match &self.attributes { - Some(attrs) => InterfaceAttributes::try_from(attrs)?, -@@ -240,20 +234,27 @@ impl APIConverter for weedle::In - Ok(object) - } - } - - // Represents a constructor for an object type. - // - // In the FFI, this will be a function that returns a pointer to an instance - // of the corresponding object type. --#[derive(Debug, Clone)] -+#[derive(Debug, Clone, Checksum)] - pub struct Constructor { - pub(super) name: String, - pub(super) arguments: Vec, -+ // We don't include the FFIFunc in the hash calculation, because: -+ // - it is entirely determined by the other fields, -+ // so excluding it is safe. -+ // - its `name` property includes a checksum derived from the very -+ // hash value we're trying to calculate here, so excluding it -+ // avoids a weird circular depenendency in the calculation. -+ #[checksum_ignore] - pub(super) ffi_func: FFIFunction, - pub(super) attributes: ConstructorAttributes, - } - - impl Constructor { - pub fn name(&self) -> &str { - &self.name - } -@@ -294,30 +295,16 @@ impl Constructor { - self.ffi_func.return_type = Some(FFIType::RustArcPtr(obj_name.to_string())); - } - - pub fn iter_types(&self) -> TypeIterator<'_> { - Box::new(self.arguments.iter().flat_map(Argument::iter_types)) - } - } - --impl Hash for Constructor { -- fn hash(&self, state: &mut H) { -- // We don't include the FFIFunc in the hash calculation, because: -- // - it is entirely determined by the other fields, -- // so excluding it is safe. -- // - its `name` property includes a checksum derived from the very -- // hash value we're trying to calculate here, so excluding it -- // avoids a weird circular depenendency in the calculation. -- self.name.hash(state); -- self.arguments.hash(state); -- self.attributes.hash(state); -- } --} -- - impl Default for Constructor { - fn default() -> Self { - Constructor { - name: String::from("new"), - arguments: Vec::new(), - ffi_func: Default::default(), - attributes: Default::default(), - } -@@ -338,22 +325,29 @@ impl APIConverter for weedl - }) - } - } - - // Represents an instance method for an object type. - // - // The FFI will represent this as a function whose first/self argument is a - // `FFIType::RustArcPtr` to the instance. --#[derive(Debug, Clone)] -+#[derive(Debug, Clone, Checksum)] - pub struct Method { - pub(super) name: String, - pub(super) object_name: String, -+ pub(super) arguments: Vec, - pub(super) return_type: Option, -- pub(super) arguments: Vec, -+ // We don't include the FFIFunc in the hash calculation, because: -+ // - it is entirely determined by the other fields, -+ // so excluding it is safe. -+ // - its `name` property includes a checksum derived from the very -+ // hash value we're trying to calculate here, so excluding it -+ // avoids a weird circular depenendency in the calculation. -+ #[checksum_ignore] - pub(super) ffi_func: FFIFunction, - pub(super) attributes: MethodAttributes, - } - - impl Method { - pub fn name(&self) -> &str { - &self.name - } -@@ -445,32 +439,16 @@ impl From f - arguments, - return_type, - ffi_func, - attributes: Default::default(), - } - } - } - --impl Hash for Method { -- fn hash(&self, state: &mut H) { -- // We don't include the FFIFunc in the hash calculation, because: -- // - it is entirely determined by the other fields, -- // so excluding it is safe. -- // - its `name` property includes a checksum derived from the very -- // hash value we're trying to calculate here, so excluding it -- // avoids a weird circular depenendency in the calculation. -- self.name.hash(state); -- self.object_name.hash(state); -- self.arguments.hash(state); -- self.return_type.hash(state); -- self.attributes.hash(state); -- } --} -- - impl APIConverter for weedle::interface::OperationInterfaceMember<'_> { - fn convert(&self, ci: &mut ComponentInterface) -> Result { - if self.special.is_some() { - bail!("special operations not supported"); - } - if self.modifier.is_some() { - bail!("method modifiers are not supported") - } -diff --git a/third_party/rust/uniffi_bindgen/src/interface/record.rs b/third_party/rust/uniffi_bindgen/src/interface/record.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/record.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/record.rs -@@ -40,30 +40,31 @@ - //! let record = ci.get_record_definition("Example").unwrap(); - //! assert_eq!(record.name(), "Example"); - //! assert_eq!(record.fields()[0].name(), "name"); - //! assert_eq!(record.fields()[1].name(), "value"); - //! # Ok::<(), anyhow::Error>(()) - //! ``` - - use anyhow::{bail, Result}; -+use uniffi_meta::Checksum; - - use super::types::{Type, TypeIterator}; - use super::{ - convert_type, - literal::{convert_default_value, Literal}, - }; - use super::{APIConverter, ComponentInterface}; - - /// Represents a "data class" style object, for passing around complex values. - /// - /// In the FFI these are represented as a byte buffer, which one side explicitly - /// serializes the data into and the other serializes it out of. So I guess they're - /// kind of like "pass by clone" values. --#[derive(Debug, Clone, Hash)] -+#[derive(Debug, Clone, Checksum)] - pub struct Record { - pub(super) name: String, - pub(super) fields: Vec, - } - - impl Record { - pub fn name(&self) -> &str { - &self.name -@@ -104,17 +105,17 @@ impl APIConverter for weedle::Di - Ok(Record { - name: self.identifier.0.to_string(), - fields: self.members.body.convert(ci)?, - }) - } - } - - // Represents an individual field on a Record. --#[derive(Debug, Clone, Hash)] -+#[derive(Debug, Clone, Checksum)] - pub struct Field { - pub(super) name: String, - pub(super) type_: Type, - pub(super) required: bool, - pub(super) default: Option, - } - - impl Field { -diff --git a/third_party/rust/uniffi_bindgen/src/interface/types/mod.rs b/third_party/rust/uniffi_bindgen/src/interface/types/mod.rs ---- a/third_party/rust/uniffi_bindgen/src/interface/types/mod.rs -+++ b/third_party/rust/uniffi_bindgen/src/interface/types/mod.rs -@@ -20,28 +20,29 @@ - //! As a developer working on UniFFI itself, you're likely to spend a fair bit of time thinking - //! about how these API-level types map into the lower-level types of the FFI layer as represented - //! by the [`ffi::FFIType`](super::ffi::FFIType) enum, but that's a detail that is invisible to end users. - - use std::{collections::hash_map::Entry, collections::BTreeSet, collections::HashMap, iter}; - - use anyhow::{bail, Result}; - use heck::ToUpperCamelCase; -+use uniffi_meta::Checksum; - - use super::ffi::FFIType; - - mod finder; - pub(super) use finder::TypeFinder; - mod resolver; - pub(super) use resolver::{resolve_builtin_type, TypeResolver}; - - /// Represents all the different high-level types that can be used in a component interface. - /// At this level we identify user-defined types by name, without knowing any details - /// of their internal structure apart from what type of thing they are (record, enum, etc). --#[derive(Debug, Clone, Eq, PartialEq, Hash, Ord, PartialOrd)] -+#[derive(Debug, Clone, Eq, PartialEq, Checksum, Ord, PartialOrd)] - pub enum Type { - // Primitive types. - UInt8, - Int8, - UInt16, - Int16, - UInt32, - Int32, -diff --git a/third_party/rust/uniffi_build/.cargo-checksum.json b/third_party/rust/uniffi_build/.cargo-checksum.json ---- a/third_party/rust/uniffi_build/.cargo-checksum.json -+++ b/third_party/rust/uniffi_build/.cargo-checksum.json -@@ -1,1 +1,1 @@ --{"files":{"Cargo.toml":"bf9105f53978ecdccad9a75fc3645f97982d3c4162a5a9b49ab16554162b51c1","src/lib.rs":"485a0c0ab99077a1d4037f4deec9801e87a248196e7589a002556fb84973528a"},"package":"510287c368a9386eb731ebe824a6fc6c82a105e20d020af1aa20519c1c1561db"} -\ No newline at end of file -+{"files":{"Cargo.toml":"30736876caf953bd0040b6c0fc824744556bf52fe23d656c7d01442d4c180674","src/lib.rs":"485a0c0ab99077a1d4037f4deec9801e87a248196e7589a002556fb84973528a"},"package":"d035e50433ee3d52ab0dcdcf3b9b26f2cc2ec39294b3c07d95865a518709455f"} -\ No newline at end of file -diff --git a/third_party/rust/uniffi_build/Cargo.toml b/third_party/rust/uniffi_build/Cargo.toml ---- a/third_party/rust/uniffi_build/Cargo.toml -+++ b/third_party/rust/uniffi_build/Cargo.toml -@@ -7,34 +7,33 @@ - # - # If you are reading this file be aware that the original Cargo.toml - # will likely look very different (and much more reasonable). - # See Cargo.toml.orig for the original contents. - - [package] - edition = "2021" - name = "uniffi_build" --version = "0.21.0" -+version = "0.21.1" - authors = ["Firefox Sync Team "] - description = "a multi-language bindings generator for rust (build script helpers)" - homepage = "https://mozilla.github.io/uniffi-rs" - documentation = "https://mozilla.github.io/uniffi-rs" - keywords = [ - "ffi", - "bindgen", - ] - license = "MPL-2.0" - repository = "https://github.com/mozilla/uniffi-rs" --resolver = "2" - - [dependencies.anyhow] - version = "1" - - [dependencies.camino] - version = "1.0.8" - - [dependencies.uniffi_bindgen] --version = "=0.21.0" -+version = "=0.21.1" - optional = true - - [features] - builtin-bindgen = ["uniffi_bindgen"] - default = [] -diff --git a/third_party/rust/uniffi_checksum_derive/.cargo-checksum.json b/third_party/rust/uniffi_checksum_derive/.cargo-checksum.json -new file mode 100644 ---- /dev/null -+++ b/third_party/rust/uniffi_checksum_derive/.cargo-checksum.json -@@ -0,0 +1,1 @@ -+{"files":{"Cargo.toml":"2ab3c60724c4c504297f8876bf0a8d1291f76a2fc46f5e83634aa147e89ffc71","src/lib.rs":"c68c69a1cf6a69e5fe78f7b069364a265c5bb6ce8c0abf0b5745eca01c79604a"},"package":"78b6e16d46caf942016997af8bbdf4b163bf8ae3deb0b667d9643de7b7ffd4c9"} -\ No newline at end of file -diff --git a/third_party/rust/uniffi_checksum_derive/Cargo.toml b/third_party/rust/uniffi_checksum_derive/Cargo.toml -new file mode 100644 ---- /dev/null -+++ b/third_party/rust/uniffi_checksum_derive/Cargo.toml -@@ -0,0 +1,42 @@ -+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO -+# -+# When uploading crates to the registry Cargo will automatically -+# "normalize" Cargo.toml files for maximal compatibility -+# with all versions of Cargo and also rewrite `path` dependencies -+# to registry (e.g., crates.io) dependencies. -+# -+# If you are reading this file be aware that the original Cargo.toml -+# will likely look very different (and much more reasonable). -+# See Cargo.toml.orig for the original contents. -+ -+[package] -+edition = "2021" -+name = "uniffi_checksum_derive" -+version = "0.21.1" -+authors = ["Firefox Sync Team "] -+description = "a multi-language bindings generator for rust (checksum custom derive)" -+homepage = "https://mozilla.github.io/uniffi-rs" -+documentation = "https://mozilla.github.io/uniffi-rs" -+keywords = [ -+ "ffi", -+ "bindgen", -+] -+license = "MPL-2.0" -+repository = "https://github.com/mozilla/uniffi-rs" -+ -+[lib] -+proc-macro = true -+ -+[dependencies.quote] -+version = "1.0" -+ -+[dependencies.syn] -+version = "1.0" -+features = [ -+ "derive", -+ "parsing", -+] -+ -+[features] -+default = [] -+nightly = [] -diff --git a/third_party/rust/uniffi_checksum_derive/src/lib.rs b/third_party/rust/uniffi_checksum_derive/src/lib.rs -new file mode 100644 ---- /dev/null -+++ b/third_party/rust/uniffi_checksum_derive/src/lib.rs -@@ -0,0 +1,134 @@ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+#![cfg_attr(feature = "nightly", feature(proc_macro_expand))] -+ -+//! Custom derive for uniffi_meta::Checksum -+ -+use proc_macro::TokenStream; -+use quote::{format_ident, quote}; -+use syn::{parse_macro_input, Attribute, Data, DeriveInput, Expr, ExprLit, Fields, Index, Lit}; -+ -+fn has_ignore_attribute(attrs: &[Attribute]) -> bool { -+ attrs.iter().any(|attr| { -+ if attr.path.is_ident("checksum_ignore") { -+ if !attr.tokens.is_empty() { -+ panic!("#[checksum_ignore] doesn't accept extra information"); -+ } -+ true -+ } else { -+ false -+ } -+ }) -+} -+ -+#[proc_macro_derive(Checksum, attributes(checksum_ignore))] -+pub fn checksum_derive(input: TokenStream) -> TokenStream { -+ let input: DeriveInput = parse_macro_input!(input); -+ -+ let name = input.ident; -+ -+ let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl(); -+ -+ let code = match input.data { -+ Data::Enum(enum_) -+ if enum_.variants.len() == 1 -+ && enum_ -+ .variants -+ .iter() -+ .all(|variant| matches!(variant.fields, Fields::Unit)) => -+ { -+ quote!() -+ } -+ Data::Enum(enum_) => { -+ let mut next_discriminant = 0u64; -+ let match_inner = enum_.variants.iter().map(|variant| { -+ let ident = &variant.ident; -+ if has_ignore_attribute(&variant.attrs) { -+ panic!("#[checksum_ignore] is not supported in enums"); -+ } -+ match &variant.discriminant { -+ Some((_, Expr::Lit(ExprLit { lit: Lit::Int(value), .. }))) => { -+ next_discriminant = value.base10_parse::().unwrap(); -+ } -+ Some(_) => { -+ panic!("#[derive(Checksum)] doesn't support non-numeric explicit discriminants in enums"); -+ } -+ None => {} -+ } -+ let discriminant = quote! { state.write(&#next_discriminant.to_le_bytes()) }; -+ next_discriminant += 1; -+ match &variant.fields { -+ Fields::Unnamed(fields) => { -+ let field_idents = fields -+ .unnamed -+ .iter() -+ .enumerate() -+ .map(|(num, _)| format_ident!("__self_{}", num)); -+ let field_stmts = field_idents -+ .clone() -+ .map(|ident| quote! { Checksum::checksum(#ident, state); }); -+ quote! { -+ Self::#ident(#(#field_idents,)*) => { -+ #discriminant; -+ #(#field_stmts)* -+ } -+ } -+ } -+ Fields::Named(fields) => { -+ let field_idents = fields -+ .named -+ .iter() -+ .map(|field| field.ident.as_ref().unwrap()); -+ let field_stmts = field_idents -+ .clone() -+ .map(|ident| quote! { Checksum::checksum(#ident, state); }); -+ quote! { -+ Self::#ident { #(#field_idents,)* } => { -+ #discriminant; -+ #(#field_stmts)* -+ } -+ } -+ } -+ Fields::Unit => quote! { Self::#ident => #discriminant, }, -+ } -+ }); -+ quote! { -+ match self { -+ #(#match_inner)* -+ } -+ } -+ } -+ Data::Struct(struct_) => { -+ let stmts = struct_ -+ .fields -+ .iter() -+ .enumerate() -+ .filter_map(|(num, field)| { -+ (!has_ignore_attribute(&field.attrs)).then(|| match field.ident.as_ref() { -+ Some(ident) => quote! { Checksum::checksum(&self.#ident, state); }, -+ None => { -+ let i = Index::from(num); -+ quote! { Checksum::checksum(&self.#i, state); } -+ } -+ }) -+ }); -+ quote! { -+ #(#stmts)* -+ } -+ } -+ Data::Union(_) => { -+ panic!("#[derive(Checksum)] is not supported for unions"); -+ } -+ }; -+ -+ quote! { -+ #[automatically_derived] -+ impl #impl_generics Checksum for #name #ty_generics #where_clause { -+ fn checksum<__H: ::core::hash::Hasher>(&self, state: &mut __H) { -+ #code -+ } -+ } -+ } -+ .into() -+} -diff --git a/third_party/rust/uniffi_macros/.cargo-checksum.json b/third_party/rust/uniffi_macros/.cargo-checksum.json ---- a/third_party/rust/uniffi_macros/.cargo-checksum.json -+++ b/third_party/rust/uniffi_macros/.cargo-checksum.json -@@ -1,1 +1,1 @@ --{"files":{"Cargo.toml":"55f7e114dd34b0c60b58890120f8707601a5401e9d49d42a239b03da2e660d4f","src/export.rs":"e23929cf6fb5542d29514fe668f3b3d836fad968eacd9c6fcba74c5cd9cf2b61","src/export/metadata.rs":"af89a9942c7c0c4043a3cd57d1e6bd71cde19005e1f9f246efac761f47eff6be","src/export/metadata/convert.rs":"81060fb3390165d77db021f44142a2f3f10882515f859d7393857083370f2d35","src/export/metadata/function.rs":"11833cabd37e7671c0a01944bec73b8892a15df814bbe4c26fdae57aad89a2ba","src/export/metadata/impl_.rs":"ecfdaa132f05dd946414281e52165ef19c90c0bfd76ec651d4ec86837bd41d1c","src/export/scaffolding.rs":"66939405063e56fc983126f249e2d7ddc3257cb045a738abd0cf813a4aafc59c","src/lib.rs":"ca77b437a58cfb3ddeb106d3c1c8378545c46ef241298e62ab1190c5136d1fb1","src/object.rs":"955b596f344304013692042bdc1760bbb1192ec33950b0dd2932cb8de94ec297","src/record.rs":"67a5c7ed6a448f7ad8f5c8e930c5e3007b2b0cac32f52cc8596bdae6fb3c816e","src/util.rs":"6389a9b4258808a3af168cf85658fb7c069172d5e528ee0e94210fa664f2a414"},"package":"5c8604503caa2cbcf271578dc51ca236d40e3b22e1514ffa2e638e2c39f6ad10"} -\ No newline at end of file -+{"files":{"Cargo.toml":"6511b493b676ac3941d70477c91abec62642c3c9aab088ecdf4f733eef3f1faa","src/export.rs":"e23929cf6fb5542d29514fe668f3b3d836fad968eacd9c6fcba74c5cd9cf2b61","src/export/metadata.rs":"af89a9942c7c0c4043a3cd57d1e6bd71cde19005e1f9f246efac761f47eff6be","src/export/metadata/convert.rs":"81060fb3390165d77db021f44142a2f3f10882515f859d7393857083370f2d35","src/export/metadata/function.rs":"11833cabd37e7671c0a01944bec73b8892a15df814bbe4c26fdae57aad89a2ba","src/export/metadata/impl_.rs":"ecfdaa132f05dd946414281e52165ef19c90c0bfd76ec651d4ec86837bd41d1c","src/export/scaffolding.rs":"66939405063e56fc983126f249e2d7ddc3257cb045a738abd0cf813a4aafc59c","src/lib.rs":"ca77b437a58cfb3ddeb106d3c1c8378545c46ef241298e62ab1190c5136d1fb1","src/object.rs":"955b596f344304013692042bdc1760bbb1192ec33950b0dd2932cb8de94ec297","src/record.rs":"67a5c7ed6a448f7ad8f5c8e930c5e3007b2b0cac32f52cc8596bdae6fb3c816e","src/util.rs":"6389a9b4258808a3af168cf85658fb7c069172d5e528ee0e94210fa664f2a414"},"package":"c96a574677566f83ea8458dac1dd7792fd63e7c3f9dbcd865f0e8d6f8057b127"} -\ No newline at end of file -diff --git a/third_party/rust/uniffi_macros/Cargo.toml b/third_party/rust/uniffi_macros/Cargo.toml ---- a/third_party/rust/uniffi_macros/Cargo.toml -+++ b/third_party/rust/uniffi_macros/Cargo.toml -@@ -7,28 +7,27 @@ - # - # If you are reading this file be aware that the original Cargo.toml - # will likely look very different (and much more reasonable). - # See Cargo.toml.orig for the original contents. - - [package] - edition = "2021" - name = "uniffi_macros" --version = "0.21.0" -+version = "0.21.1" - authors = ["Firefox Sync Team "] - description = "a multi-language bindings generator for rust (convenience macros)" - homepage = "https://mozilla.github.io/uniffi-rs" - documentation = "https://mozilla.github.io/uniffi-rs" - keywords = [ - "ffi", - "bindgen", - ] - license = "MPL-2.0" - repository = "https://github.com/mozilla/uniffi-rs" --resolver = "2" - - [lib] - proc-macro = true - - [dependencies.bincode] - version = "1.3" - - [dependencies.camino] -@@ -55,17 +54,17 @@ features = [ - "full", - "visit-mut", - ] - - [dependencies.toml] - version = "0.5.9" - - [dependencies.uniffi_build] --version = "=0.21.0" -+version = "=0.21.1" - - [dependencies.uniffi_meta] --version = "=0.21.0" -+version = "=0.21.1" - - [features] - builtin-bindgen = ["uniffi_build/builtin-bindgen"] - default = [] - nightly = [] -diff --git a/third_party/rust/uniffi_meta/.cargo-checksum.json b/third_party/rust/uniffi_meta/.cargo-checksum.json ---- a/third_party/rust/uniffi_meta/.cargo-checksum.json -+++ b/third_party/rust/uniffi_meta/.cargo-checksum.json -@@ -1,1 +1,1 @@ --{"files":{"Cargo.toml":"4a474782b3acac7e99435c0cfc6cd4790817ee5c15980b10dc927d95795b977f","src/lib.rs":"dc4c91763c01e8c09ef55cdb103bc02c7aba71c5660ba88f776a8a03a747d6e8"},"package":"cd9417cc653937681436b93838d8c5f97a5b8c58697813982ee8810bd1dc3b57"} -\ No newline at end of file -+{"files":{"Cargo.toml":"4c34032ec5fadf8b996c671425d5afa38e0e5c223ab0b2ed3b44099fb78157d3","src/lib.rs":"a9854421f120e1c4a9d7d36bb006a4c5e7d2e054564f95aa9b6956e7ebb348fd"},"package":"729835442da829c9b6f7c111c76cf87b2498e129101203bec94f0c39a3296a38"} -\ No newline at end of file -diff --git a/third_party/rust/uniffi_meta/Cargo.toml b/third_party/rust/uniffi_meta/Cargo.toml ---- a/third_party/rust/uniffi_meta/Cargo.toml -+++ b/third_party/rust/uniffi_meta/Cargo.toml -@@ -7,22 +7,27 @@ - # - # If you are reading this file be aware that the original Cargo.toml - # will likely look very different (and much more reasonable). - # See Cargo.toml.orig for the original contents. - - [package] - edition = "2021" - name = "uniffi_meta" --version = "0.21.0" -+version = "0.21.1" - description = "uniffi_meta" - homepage = "https://mozilla.github.io/uniffi-rs" - keywords = [ - "ffi", - "bindgen", - ] - license = "MPL-2.0" - repository = "https://github.com/mozilla/uniffi-rs" --resolver = "2" - - [dependencies.serde] - version = "1.0.136" - features = ["derive"] -+ -+[dependencies.siphasher] -+version = "0.3" -+ -+[dependencies.uniffi_checksum_derive] -+version = "0.21.0" -diff --git a/third_party/rust/uniffi_meta/src/lib.rs b/third_party/rust/uniffi_meta/src/lib.rs ---- a/third_party/rust/uniffi_meta/src/lib.rs -+++ b/third_party/rust/uniffi_meta/src/lib.rs -@@ -1,57 +1,127 @@ - /* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - --use std::{ -- collections::hash_map::DefaultHasher, -- hash::{Hash, Hasher}, --}; -+use std::hash::Hasher; -+pub use uniffi_checksum_derive::Checksum; - - use serde::{Deserialize, Serialize}; - --#[derive(Clone, Debug, Hash, Deserialize, Serialize)] -+/// Similar to std::hash::Hash. -+/// -+/// Implementations of this trait are expected to update the hasher state in -+/// the same way across platforms. #[derive(Checksum)] will do the right thing. -+pub trait Checksum { -+ fn checksum(&self, state: &mut H); -+} -+ -+impl Checksum for bool { -+ fn checksum(&self, state: &mut H) { -+ state.write_u8(*self as u8); -+ } -+} -+ -+impl Checksum for u64 { -+ fn checksum(&self, state: &mut H) { -+ state.write(&self.to_le_bytes()); -+ } -+} -+ -+impl Checksum for i64 { -+ fn checksum(&self, state: &mut H) { -+ state.write(&self.to_le_bytes()); -+ } -+} -+ -+impl Checksum for Box { -+ fn checksum(&self, state: &mut H) { -+ (**self).checksum(state) -+ } -+} -+ -+impl Checksum for [T] { -+ fn checksum(&self, state: &mut H) { -+ state.write(&(self.len() as u64).to_le_bytes()); -+ for item in self { -+ Checksum::checksum(item, state); -+ } -+ } -+} -+ -+impl Checksum for Vec { -+ fn checksum(&self, state: &mut H) { -+ Checksum::checksum(&**self, state); -+ } -+} -+ -+impl Checksum for Option { -+ fn checksum(&self, state: &mut H) { -+ match self { -+ None => state.write(&0u64.to_le_bytes()), -+ Some(value) => { -+ state.write(&1u64.to_le_bytes()); -+ Checksum::checksum(value, state) -+ } -+ } -+ } -+} -+ -+impl Checksum for str { -+ fn checksum(&self, state: &mut H) { -+ state.write(self.as_bytes()); -+ state.write_u8(0xff); -+ } -+} -+ -+impl Checksum for String { -+ fn checksum(&self, state: &mut H) { -+ (**self).checksum(state) -+ } -+} -+ -+#[derive(Clone, Debug, Checksum, Deserialize, Serialize)] - pub struct FnMetadata { - pub module_path: Vec, - pub name: String, - pub inputs: Vec, - pub return_type: Option, - } - - impl FnMetadata { - pub fn ffi_symbol_name(&self) -> String { - fn_ffi_symbol_name(&self.module_path, &self.name, checksum(self)) - } - } - --#[derive(Clone, Debug, Hash, Deserialize, Serialize)] -+#[derive(Clone, Debug, Checksum, Deserialize, Serialize)] - pub struct MethodMetadata { - pub module_path: Vec, - pub self_name: String, - pub name: String, - pub inputs: Vec, - pub return_type: Option, - } - - impl MethodMetadata { - pub fn ffi_symbol_name(&self) -> String { - let full_name = format!("impl_{}_{}", self.self_name, self.name); - fn_ffi_symbol_name(&self.module_path, &full_name, checksum(self)) - } - } - --#[derive(Clone, Debug, Hash, Deserialize, Serialize)] -+#[derive(Clone, Debug, Checksum, Deserialize, Serialize)] - pub struct FnParamMetadata { - pub name: String, - #[serde(rename = "type")] - pub ty: Type, - } - --#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize)] -+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Checksum, Deserialize, Serialize)] - pub enum Type { - U8, - U16, - U32, - U64, - I8, - I16, - I32, -@@ -73,63 +143,63 @@ pub enum Type { - ArcObject { - object_name: String, - }, - Unresolved { - name: String, - }, - } - --#[derive(Clone, Debug, Hash, Deserialize, Serialize)] -+#[derive(Clone, Debug, Checksum, Deserialize, Serialize)] - pub struct RecordMetadata { - pub module_path: Vec, - pub name: String, - pub fields: Vec, - } - --#[derive(Clone, Debug, Hash, Deserialize, Serialize)] -+#[derive(Clone, Debug, Checksum, Deserialize, Serialize)] - pub struct FieldMetadata { - pub name: String, - #[serde(rename = "type")] - pub ty: Type, - } - --#[derive(Clone, Debug, Hash, Deserialize, Serialize)] -+#[derive(Clone, Debug, Checksum, Deserialize, Serialize)] - pub struct ObjectMetadata { - pub module_path: Vec, - pub name: String, - } - - impl ObjectMetadata { - /// FFI symbol name for the `free` function for this object. - /// - /// This function is used to free the memory used by this object. - pub fn free_ffi_symbol_name(&self) -> String { - let free_name = format!("object_free_{}", self.name); - fn_ffi_symbol_name(&self.module_path, &free_name, checksum(self)) - } - } - --/// Returns the last 16 bits of the value's hash as computed with [`DefaultHasher`]. -+/// Returns the last 16 bits of the value's hash as computed with [`SipHasher13`]. - /// - /// To be used as a checksum of FFI symbols, as a safeguard against different UniFFI versions being - /// used for scaffolding and bindings generation. --pub fn checksum(val: &T) -> u16 { -- let mut hasher = DefaultHasher::new(); -- val.hash(&mut hasher); -+pub fn checksum(val: &T) -> u16 { -+ let mut hasher = siphasher::sip::SipHasher13::new(); -+ val.checksum(&mut hasher); - (hasher.finish() & 0x000000000000FFFF) as u16 - } - - pub fn fn_ffi_symbol_name(mod_path: &[String], name: &str, checksum: u16) -> String { - let mod_path = mod_path.join("__"); - format!("_uniffi_{mod_path}_{name}_{checksum:x}") - } - - /// Enum covering all the possible metadata types --#[derive(Clone, Debug, Hash, Deserialize, Serialize)] -+#[derive(Clone, Debug, Checksum, Deserialize, Serialize)] - pub enum Metadata { - Func(FnMetadata), - Method(MethodMetadata), - Record(RecordMetadata), - Object(ObjectMetadata), - } - - impl From for Metadata { - From 4de25e64b216ffcd98af8a37e04f31c34efddffe Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 20 2024 03:57:35 +0000 Subject: [PATCH 65/73] iceweasel: reduce logging noise --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index f01bb32..caea6a6 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -358,7 +358,8 @@ prepare() { # Use system python-typing-extensions instead of the old vendored one to avoid # unresolvable dependency versions. They are probably downloaded when network # connectivity is enabled at built time, but that is not the case for Parabola. - rm -rfv third_party/python/typing_extensions + echo "deleting vendored 'python-typing-extensions'" + rm -rfv third_party/python/typing_extensions | grep -Fq '' # arch-specific technical patching case ${CARCH} in @@ -607,10 +608,11 @@ END # "${branding_srcdir}/branding/watermark.svg" # process default Top Sites and their icons - find ${tippytopdir} -type f \ + echo "deleting unused \"Top Sites\"" + find "${tippytopdir}" -type f \ -not -name 'wikipedia-org*' \ -not -name 'top_sites.json' \ - -exec rm -v {} \; + -exec rm -v {} \; | grep -Fq '' [[ "${CARCH}" != armv7h ]] || export MAGICK_TIME_LIMIT=300 # magick: time limit exceeded for image in "${branding_srcdir}"/tippytop/*.svg; do local outname=$(basename -s .svg "${image}") @@ -636,10 +638,11 @@ END pushd browser/components/search/extensions > /dev/null # Delete unused search engine configs + echo "deleting unused search engine configs" find -mindepth 1 -maxdepth 1 \ -not -name ddg \ -not -name wikipedia \ - -exec rm -frv {} \; + -exec rm -frv {} \; | grep -Fq '' popd > /dev/null @@ -649,7 +652,7 @@ END # Upstream tarball can contain some ignored cruft, # including binaries (for example, python3). echo 'Removing files specified in .gitignore...' - git init && git clean -dfX \ + git init -b master && git clean -dfX \ --exclude='!ipc/chromium/src/third_party/libevent/evconfig-private.h' \ --exclude='!toolkit/crashreporter/google-breakpad/src/third_party/lss/' \ --exclude='!third_party/python/**/*.egg-info/' @@ -689,7 +692,8 @@ END echo "removing remaining non-free bits" rm -v toolkit/crashreporter/tools/upload_symbols.py - rm -frv third_party/rust/winapi-{i686,x86_64}-pc-windows-gnu/**/*.a + rm -frv third_party/rust/winapi-{i686,x86_64}-pc-windows-gnu/**/*.a | \ + sed 's|/[^/]*\.a$|/*.a|' | sort -u ## patching sanity checks ## _check_patching From db65c0e0cf191aa91913f0d891863de0f1d0bb85 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 20 2024 04:05:45 +0000 Subject: [PATCH 66/73] iceweasel: housekeeping --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index caea6a6..6888b62 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -567,8 +567,8 @@ END export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' export QUILT_DIFF_ARGS='--no-timestamps' export QUILT_PC="${srcdir}"/.pc - rm -rf -- ${branding_destdir} - cp -aT -- ${branding_srcdir}/branding ${branding_destdir} + rm -rf -- "${branding_destdir}" + cp -aT -- "${branding_srcdir}"/branding "${branding_destdir}" quilt push -av pushd "${branding_destdir}" > /dev/null @@ -578,16 +578,16 @@ END for size in 16 22 24 32 48 64 128 256 do rsvg-convert -w ${size} -h ${size} iceweasel_icon.svg -o default${size}.png done - cp iceweasel_logo.svg content/aboutlogins.svg - cp iceweasel_logo.svg content/about-logo.svg -# cp iceweasel_logo.svg content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content - rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo.png - rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png - cp content/about-logo.png content/about-logo-private.png - cp content/about-logo@2x.png content/about-logo-private@2x.png - echo "${blank_svg}" > content/$pkgname-symbolic.svg # TODO: branding package - cp content/${pkgname}-symbolic.svg "${srcdir}"/identity-icons-brand.svg # minimize diff (in package()) - cp ../unofficial/document.ico document.ico + cp iceweasel_logo.svg content/aboutlogins.svg + cp iceweasel_logo.svg content/about-logo.svg +# cp iceweasel_logo.svg content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content + rsvg-convert -a -w 192 iceweasel_logo.svg -o content/about-logo.png + rsvg-convert -a -w 384 iceweasel_logo.svg -o content/about-logo@2x.png + cp content/about-logo.png content/about-logo-private.png + cp content/about-logo@2x.png content/about-logo-private@2x.png + echo "${blank_svg}" > content/$pkgname-symbolic.svg # TODO: branding package + cp content/$pkgname-symbolic.svg "${srcdir}"/identity-icons-brand.svg # minimize diff (in package()) + cp ../unofficial/document.ico document.ico popd > /dev/null @@ -603,9 +603,9 @@ END # and any unused branding components may be deleted from the branding package # Put "Start Page" branding images in the source code # install -m644 -t browser/base/content/abouthome -- \ - # "${branding_srcdir}/branding"/{drm-free,gnu_headshadow,parabola-banner}.png + # "${branding_srcdir}"/branding/{drm-free,gnu_headshadow,parabola-banner}.png # install -m644 -t browser/extensions/onboarding/content/img -- \ - # "${branding_srcdir}/branding/watermark.svg" + # "${branding_srcdir}"/branding/watermark.svg # process default Top Sites and their icons echo "deleting unused \"Top Sites\"" @@ -616,17 +616,17 @@ END [[ "${CARCH}" != armv7h ]] || export MAGICK_TIME_LIMIT=300 # magick: time limit exceeded for image in "${branding_srcdir}"/tippytop/*.svg; do local outname=$(basename -s .svg "${image}") - local size=$(identify -format '%wx%h' ${tippytopdir}/images/wikipedia-org@2x.png) + local size=$(identify -format '%wx%h' "${tippytopdir}"/images/wikipedia-org@2x.png) local background=$( [[ "${outname}" == 'gnu' ]] && echo 'white' || echo 'none' ) magick -density 300 ${image} \ -gravity center -resize ${size} -extent ${size} \ - "${tippytopdir}/images/${outname}@2x.png" + "${tippytopdir}"/images/${outname}@2x.png size=256x256 magick -density 300 -background ${background} ${image} \ -gravity center -resize ${size} -extent ${size} \ -define icon:auto-resize=64,48,32,16 \ - "${tippytopdir}/favicons/${outname}.ico" + "${tippytopdir}"/favicons/${outname}.ico done # misc branding From a4f99c0c578d8759435ca4f823a94fc8d4699363 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 20 2024 04:08:36 +0000 Subject: [PATCH 67/73] iceweasel: tweak for armv7h --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 6888b62..ea1782b 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -238,7 +238,7 @@ readonly _SKIP_PGO=$(case "${CARCH}" in armv7h|i686) echo 1 ;; *) echo 0 ;; esac # use GCC vs LLVM # trying one or the other, may resolve sporadic compiler/linker discrepancies -readonly _USE_ALT_COMPILER=$(case "${CARCH}" in armv7h) echo 1 ;; *) echo 0 ;; esac) +readonly _USE_ALT_COMPILER=$(case "${CARCH}" in armv7h) echo 0 ;; *) echo 0 ;; esac) # use 'bfd' linker vs 'lld' # most significantly, this also disables LTO and debugging @@ -258,10 +258,6 @@ armv7h) makedepends=( ${makedepends[*]/wasi-*/} ) # armv7h has no wasi compiler depends+=( libicudata.so libicui18n.so libicuuc.so ) # --with-system-icu - - # warning: obj/dist/system_wrappers/cmath:3:15: fatal error: 'cmath' file not found - (( _USE_ALT_COMPILER )) || makedepends=( ${makedepends[*]/llvm/llvm15} llvm15-libs ) - # still FTBS ;; i686) # NOTE: due to python incompatabilities in arch32, @@ -361,9 +357,19 @@ prepare() { echo "deleting vendored 'python-typing-extensions'" rm -rfv third_party/python/typing_extensions | grep -Fq '' - # arch-specific technical patching + + ## [ARCH-SPECIFIC PATCHING] ## + case ${CARCH} in aarch64|armv7h) + # FTBS with LLVM: + # intl/lwbrk/LineBreaker.cpp:453:3: error: static assertion failed due to requirement 'U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass)': Gecko vs ICU LineBreak class mismatch + # appears to be: https://bugzilla.mozilla.org/show_bug.cgi?id=1843007#c1 + # but --with-system-icu is still needed + # crude fix, adapted from linuxfromscratch https://wiki.linuxfromscratch.org/blfs/ticket/18799 + for i in {43..47}; do + sed '/ZWJ/s/}/,CLASS_CHARACTER&/' -i intl/lwbrk/LineBreaker.cpp + done ;; i686) # readelf: Error: Unable to seek to 0x801db328 for section headers @@ -521,7 +527,7 @@ END # archarm `export` commands are under the '[ARCH-SPECIFIC BUILD ENV]' section - # archarm patching is under the 'technical patching' section + # archarm patching is under the '[ARCH-SPECIFIC PATCHING]' section # At this point in the recipe, the arch, arch32, and parabola PKGBUILDs # have prepared a temporary ${srcdir}/mozconfig; but the archarm PKGBUILD @@ -545,7 +551,7 @@ END ac_add_options --disable-webrtc END - # arch32 patching is under the 'technical patching' section + # arch32 patching is under the '[ARCH-SPECIFIC PATCHING]' section ;; x86_64) ;; @@ -727,6 +733,17 @@ build() { export CXXFLAGS+=" -g0" export LDFLAGS+=" -Wl,--no-keep-memory" export RUSTFLAGS="-Cdebuginfo=0" + + # clang-16: warning: argument unused during compilation: '-fstack-clash-protection' [-Wunused-command-line-argument] + export CFLAGS+=' -Wno-unused-command-line-argument' + export CXXFLAGS+=' -Wno-unused-command-line-argument' + + # FTBS with LLVM: + # warning: obj/dist/system_wrappers/cmath:3:15: fatal error: 'cmath' file not found + if ! (( _USE_ALT_COMPILER )) + then export CFLAGS+=" -I/usr/include/c++/12.1.0 -I/usr/include/c++/12.1.0/armv7l-unknown-linux-gnueabihf" + export CXXFLAGS+=" -I/usr/include/c++/12.1.0 -I/usr/include/c++/12.1.0/armv7l-unknown-linux-gnueabihf" + fi ;; i686) # -fno-plt with cross-LTO -> LLVM ERROR: Function Import: link error From ada9a1650ad197d9337f7562331143c6bcd92dc6 Mon Sep 17 00:00:00 2001 From: David P Date: Jan 20 2024 22:12:40 +0000 Subject: [PATCH 68/73] addpkg: libre/linux-libre-rt 6.6.5.16.realtime1-1 Signed-off-by: David P. --- diff --git a/libre/linux-libre-rt/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/libre/linux-libre-rt/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch new file mode 100644 index 0000000..d4c3cf0 --- /dev/null +++ b/libre/linux-libre-rt/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -0,0 +1,51 @@ +From 4533007cef1bd1da546752b372234b9bb9548214 Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Sun, 2 Dec 2012 19:59:28 +0100 +Subject: [PATCH 1/7] ARM: atags: add support for Marvell's u-boot + +Marvell uses a specific atag in its u-boot which includes among other +information the MAC addresses for up to 4 network interfaces. + +Signed-off-by: Willy Tarreau +--- + arch/arm/include/uapi/asm/setup.h | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h +index 25ceda63b284..83578c54975b 100644 +--- a/arch/arm/include/uapi/asm/setup.h ++++ b/arch/arm/include/uapi/asm/setup.h +@@ -144,6 +144,18 @@ struct tag_memclk { + __u32 fmemclk; + }; + ++/* Marvell uboot parameters */ ++#define ATAG_MV_UBOOT 0x41000403 ++struct tag_mv_uboot { ++ __u32 uboot_version; ++ __u32 tclk; ++ __u32 sysclk; ++ __u32 isUsbHost; ++ __u8 macAddr[4][6]; ++ __u16 mtu[4]; ++ __u32 nand_ecc; ++}; ++ + struct tag { + struct tag_header hdr; + union { +@@ -166,6 +178,11 @@ struct tag { + * DC21285 specific + */ + struct tag_memclk memclk; ++ ++ /* ++ * Marvell specific ++ */ ++ struct tag_mv_uboot mv_uboot; + } u; + }; + +-- +2.37.0 + diff --git a/libre/linux-libre-rt/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre-rt/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch new file mode 100644 index 0000000..f4a913a --- /dev/null +++ b/libre/linux-libre-rt/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -0,0 +1,154 @@ +From 1ab962c7265f1be59e7071292d1d19e0a7b6ac72 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Mon, 16 Sep 2019 04:53:20 +0200 +Subject: [PATCH 1/5] ZEN: Add sysctl and CONFIG to disallow unprivileged + CLONE_NEWUSER + +Our default behavior continues to match the vanilla kernel. +--- + include/linux/user_namespace.h | 4 ++++ + init/Kconfig | 16 ++++++++++++++++ + kernel/fork.c | 14 ++++++++++++++ + kernel/sysctl.c | 12 ++++++++++++ + kernel/user_namespace.c | 7 +++++++ + 5 files changed, 53 insertions(+) + +diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h +index 45f09bec02c4..87b20e2ee274 100644 +--- a/include/linux/user_namespace.h ++++ b/include/linux/user_namespace.h +@@ -148,6 +148,8 @@ static inline void set_userns_rlimit_max(struct user_namespace *ns, + + #ifdef CONFIG_USER_NS + ++extern int unprivileged_userns_clone; ++ + static inline struct user_namespace *get_user_ns(struct user_namespace *ns) + { + if (ns) +@@ -181,6 +183,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); + struct ns_common *ns_get_owner(struct ns_common *ns); + #else + ++#define unprivileged_userns_clone 0 ++ + static inline struct user_namespace *get_user_ns(struct user_namespace *ns) + { + return &init_user_ns; +diff --git a/init/Kconfig b/init/Kconfig +index 6d35728b94b2..0562c8ca7b30 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -1226,6 +1226,22 @@ config USER_NS + + If unsure, say N. + ++config USER_NS_UNPRIVILEGED ++ bool "Allow unprivileged users to create namespaces" ++ default y ++ depends on USER_NS ++ help ++ When disabled, unprivileged users will not be able to create ++ new namespaces. Allowing users to create their own namespaces ++ has been part of several recent local privilege escalation ++ exploits, so if you need user namespaces but are ++ paranoid^Wsecurity-conscious you want to disable this. ++ ++ This setting can be overridden at runtime via the ++ kernel.unprivileged_userns_clone sysctl. ++ ++ If unsure, say Y. ++ + config PID_NS + bool "PID Namespaces" + default y +diff --git a/kernel/fork.c b/kernel/fork.c +index 177ce7438db6..6ecece1407fc 100644 +--- a/kernel/fork.c ++++ b/kernel/fork.c +@@ -100,6 +100,10 @@ + #include + #include + ++#ifdef CONFIG_USER_NS ++#include ++#endif ++ + #include + #include + #include +@@ -2260,6 +2264,10 @@ __latent_entropy struct task_struct *copy_process( + if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) + return ERR_PTR(-EINVAL); + ++ if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) ++ if (!capable(CAP_SYS_ADMIN)) ++ return ERR_PTR(-EPERM); ++ + /* + * Thread groups must share signals as well, and detached threads + * can only be started up within the thread group. +@@ -3413,6 +3421,12 @@ int ksys_unshare(unsigned long unshare_flags) + if (unshare_flags & CLONE_NEWNS) + unshare_flags |= CLONE_FS; + ++ if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) { ++ err = -EPERM; ++ if (!capable(CAP_SYS_ADMIN)) ++ goto bad_unshare_out; ++ } ++ + err = check_unshare_flags(unshare_flags); + if (err) + goto bad_unshare_out; +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 354a2d294f52..5bc5605e7cdb 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -80,6 +80,9 @@ + #ifdef CONFIG_RT_MUTEXES + #include + #endif ++#ifdef CONFIG_USER_NS ++#include ++#endif + + /* shared constants to be used in various sysctls */ + const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 }; +@@ -1623,6 +1626,15 @@ static struct ctl_table kern_table[] = { + .mode = 0644, + .proc_handler = proc_dointvec, + }, ++#ifdef CONFIG_USER_NS ++ { ++ .procname = "unprivileged_userns_clone", ++ .data = &unprivileged_userns_clone, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = proc_dointvec, ++ }, ++#endif + #ifdef CONFIG_PROC_SYSCTL + { + .procname = "tainted", +diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c +index 1d8e47bed3f1..fec01d016a35 100644 +--- a/kernel/user_namespace.c ++++ b/kernel/user_namespace.c +@@ -22,6 +22,13 @@ + #include + #include + ++/* sysctl */ ++#ifdef CONFIG_USER_NS_UNPRIVILEGED ++int unprivileged_userns_clone = 1; ++#else ++int unprivileged_userns_clone; ++#endif ++ + static struct kmem_cache *user_ns_cachep __read_mostly; + static DEFINE_MUTEX(userns_state_mutex); + +-- +2.43.0 + diff --git a/libre/linux-libre-rt/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/libre/linux-libre-rt/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch new file mode 100644 index 0000000..e9de435 --- /dev/null +++ b/libre/linux-libre-rt/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch @@ -0,0 +1,39 @@ +From 716120e8010a7f400c6bed7384000e95e1465c94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= +Date: Mon, 26 Aug 2013 19:19:44 +0300 +Subject: [PATCH 1/2] usb serial gadget: no TTY hangup on USB disconnect [WIP] +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We may want to maintain the TTY over USB disconnects. + +This is useful when we have a terminal console to a host which +power-cycles or for other reasons resets the USB host controller. + +Signed-off-by: Kyösti Mälkki +--- + drivers/usb/gadget/function/u_serial.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c +index b369292..d156a28 100644 +--- a/drivers/usb/gadget/function/u_serial.c ++++ b/drivers/usb/gadget/function/u_serial.c +@@ -1258,8 +1258,13 @@ void gserial_disconnect(struct gserial *gser) + gser->ioport = NULL; + if (port->port.count > 0 || port->openclose) { + wake_up_interruptible(&port->drain_wait); ++#if 0 + if (port->port.tty) + tty_hangup(port->port.tty); ++#else ++ if (port->port.tty) ++ stop_tty(port->port.tty); ++#endif + } + spin_unlock_irqrestore(&port->port_lock, flags); + +-- +1.8.1.1 + diff --git a/libre/linux-libre-rt/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/libre/linux-libre-rt/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch new file mode 100644 index 0000000..758c050 --- /dev/null +++ b/libre/linux-libre-rt/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -0,0 +1,38 @@ +From b2f96ec9b408c8bbec437c3d3b54c0b748fca85a Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Sun, 2 Dec 2012 19:56:58 +0100 +Subject: [PATCH 2/7] ARM: atags/fdt: retrieve MAC addresses from Marvell boot + loader + +The atags are parsed and if a Marvell atag is found, up to 4 MAC +addresses are extracted there and assigned to node aliases eth0..3 +with the name "mac-address". + +This was tested on my Mirabox and the two NICs had their correct +address set. + +Signed-off-by: Willy Tarreau +--- + arch/arm/boot/compressed/atags_to_fdt.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c +index 1feb6b0f7a1f..5e5cb3094b6a 100644 +--- a/arch/arm/boot/compressed/atags_to_fdt.c ++++ b/arch/arm/boot/compressed/atags_to_fdt.c +@@ -205,6 +205,12 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) + hex_str(serno, atag->u.serialnr.high); + hex_str(serno+8, atag->u.serialnr.low); + setprop_string(fdt, "/", "serial-number", serno); ++ } else if (atag->hdr.tag == ATAG_MV_UBOOT) { ++ /* This ATAG provides up to 4 MAC addresses */ ++ setprop(fdt, "eth0", "mac-address", atag->u.mv_uboot.macAddr[0], 6); ++ setprop(fdt, "eth1", "mac-address", atag->u.mv_uboot.macAddr[1], 6); ++ setprop(fdt, "eth2", "mac-address", atag->u.mv_uboot.macAddr[2], 6); ++ setprop(fdt, "eth3", "mac-address", atag->u.mv_uboot.macAddr[3], 6); + } + } + +-- +2.37.0 + diff --git a/libre/linux-libre-rt/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch b/libre/linux-libre-rt/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch new file mode 100644 index 0000000..f8a56fb --- /dev/null +++ b/libre/linux-libre-rt/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch @@ -0,0 +1,89 @@ +From ed37397be7fb48e57536a4e2ffe983569611a4cc Mon Sep 17 00:00:00 2001 +From: Javier Martinez Canillas +Date: Thu, 19 May 2022 14:40:07 +0200 +Subject: [PATCH 2/5] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 + is set + +The Nvidia proprietary driver has some bugs that leads to issues if used +with the simpledrm driver. The most noticeable is that does not register +an emulated fbdev device. + +It just relies on a fbdev to be registered by another driver, that could +be that could be attached to the framebuffer console. On UEFI machines, +this is the efifb driver. + +This means that disabling the efifb driver will cause virtual consoles to +not be present in the system when using the Nvidia driver. Legacy BIOS is +not affected just because fbcon is not used there, but instead vgacon. + +Unless a VGA mode is specified using the vga= kernel command line option, +in that case the vesafb driver is used instead and its fbdev attached to +the fbcon. + +This is a problem because with CONFIG_SYSFB_SIMPLEFB=y, the sysfb platform +code attempts to register a "simple-framebuffer" platform device (that is +matched against simpledrm) and only registers either an "efi-framebuffer" +or "vesa-framebuffer" if this fails to be registered due the video modes +not being compatible. + +The Nvidia driver relying on another driver to register the fbdev is quite +fragile, since it can't really assume those will stick around. For example +there are patches posted to remove the EFI and VESA platform devices once +a real DRM or fbdev driver probes. + +But in any case, moving to a simpledrm + emulated fbdev only breaks this +assumption and causes users to not have VT if the Nvidia driver is used. + +So to prevent this, let's add a workaround and make the sysfb to skip the +"simple-framebuffer" registration when nvidia-drm.modeset=1 option is set. + +This is quite horrible, but honestly I can't think of any other approach. + +For this to work, the CONFIG_FB_EFI and CONFIG_FB_VESA config options must +be enabled besides CONFIG_DRM_SIMPLEDRM. + +Signed-off-by: Javier Martinez Canillas +Cherry-picked-for: https://bugs.archlinux.org/task/73720 +--- + drivers/firmware/sysfb.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c +index 82fcfd29bc4d..17b7e096b682 100644 +--- a/drivers/firmware/sysfb.c ++++ b/drivers/firmware/sysfb.c +@@ -34,6 +34,22 @@ + #include + #include + ++static int skip_simpledrm; ++ ++static int __init simpledrm_disable(char *opt) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ get_option(&opt, &skip_simpledrm); ++ ++ if (skip_simpledrm) ++ pr_info("The simpledrm driver will not be probed\n"); ++ ++ return 0; ++} ++early_param("nvidia-drm.modeset", simpledrm_disable); ++ + static struct platform_device *pd; + static DEFINE_MUTEX(disable_lock); + static bool disabled; +@@ -85,7 +101,7 @@ static __init int sysfb_init(void) + + /* try to create a simple-framebuffer device */ + compatible = sysfb_parse_mode(si, &mode); +- if (compatible) { ++ if (compatible && !skip_simpledrm) { + pd = sysfb_create_simplefb(si, &mode); + if (!IS_ERR(pd)) + goto unlock_mutex; +-- +2.43.0 + diff --git a/libre/linux-libre-rt/0002-fix-Atmel-maXTouch-touchscreen-support.patch b/libre/linux-libre-rt/0002-fix-Atmel-maXTouch-touchscreen-support.patch new file mode 100644 index 0000000..5ad26fc --- /dev/null +++ b/libre/linux-libre-rt/0002-fix-Atmel-maXTouch-touchscreen-support.patch @@ -0,0 +1,37 @@ +From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001 +From: André Silva +Date: Tue, 22 Mar 2016 17:58:59 -0300 +Subject: [PATCH 2/2] fix Atmel maXTouch touchscreen support + +The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu, +but not with the current longterm and mainline kernels in +Parabola. + +Now it needs to load nonfree firmware in mxt_initialize(), +which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the +atmel_mxt_ts driver fails to work. + +This driver works if changing reject_firmware_nowait to +request_firmware_nowait in atmel_mxt_ts.c. This line is +requesting the file named MXT_CFG_NAME, and it's a config file, +not the firmware blob. + +Signed-off-by: André Silva +Signed-off-by: mytbk +--- + drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c +index 726a83e..d818834 100644 +--- a/drivers/input/touchscreen/atmel_mxt_ts.c ++++ b/drivers/input/touchscreen/atmel_mxt_ts.c +@@ -1989,7 +1989,7 @@ static int mxt_initialize(struct mxt_data *data) + if (error) + goto err_free_object_table; + +- error = reject_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, ++ error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, + &client->dev, GFP_KERNEL, data, + mxt_config_cb); + if (error) { diff --git a/libre/linux-libre-rt/0003-HID-amd_sfh-Check-that-sensors-are-enabled-before-se.patch b/libre/linux-libre-rt/0003-HID-amd_sfh-Check-that-sensors-are-enabled-before-se.patch new file mode 100644 index 0000000..61656b6 --- /dev/null +++ b/libre/linux-libre-rt/0003-HID-amd_sfh-Check-that-sensors-are-enabled-before-se.patch @@ -0,0 +1,63 @@ +From 32e4bc1b86e21f941767b2faf48446145ca30d44 Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Tue, 20 Jun 2023 15:01:17 -0500 +Subject: [PATCH 3/5] HID: amd_sfh: Check that sensors are enabled before + set/get report + +A crash was reported in amd-sfh related to hid core initialization +before SFH initialization has run. + +``` + amdtp_hid_request+0x36/0x50 [amd_sfh +2e3095779aada9fdb1764f08ca578ccb14e41fe4] + sensor_hub_get_feature+0xad/0x170 [hid_sensor_hub +d6157999c9d260a1bfa6f27d4a0dc2c3e2c5654e] + hid_sensor_parse_common_attributes+0x217/0x310 [hid_sensor_iio_common +07a7935272aa9c7a28193b574580b3e953a64ec4] + hid_gyro_3d_probe+0x7f/0x2e0 [hid_sensor_gyro_3d +9f2eb51294a1f0c0315b365f335617cbaef01eab] + platform_probe+0x44/0xa0 + really_probe+0x19e/0x3e0 +``` + +Ensure that sensors have been set up before calling into +amd_sfh_get_report() or amd_sfh_set_report(). + +Cc: stable@vger.kernel.org +Cc: Linux regression tracking (Thorsten Leemhuis) +Fixes: 7bcfdab3f0c6 ("HID: amd_sfh: if no sensors are enabled, clean up") +Reported-by: Haochen Tong +Link: https://lore.kernel.org/all/3250319.ancTxkQ2z5@zen/T/ +Signed-off-by: Mario Limonciello +Cherry-picked-for: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/7 +--- + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c +index bdb578e0899f..0f1d6778051f 100644 +--- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c ++++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c +@@ -25,6 +25,9 @@ void amd_sfh_set_report(struct hid_device *hid, int report_id, + struct amdtp_cl_data *cli_data = hid_data->cli_data; + int i; + ++ if (!cli_data->is_any_sensor_enabled) ++ return; ++ + for (i = 0; i < cli_data->num_hid_devices; i++) { + if (cli_data->hid_sensor_hubs[i] == hid) { + cli_data->cur_hid_dev = i; +@@ -41,6 +44,9 @@ int amd_sfh_get_report(struct hid_device *hid, int report_id, int report_type) + struct request_list *req_list = &cli_data->req_list; + int i; + ++ if (!cli_data->is_any_sensor_enabled) ++ return -ENODEV; ++ + for (i = 0; i < cli_data->num_hid_devices; i++) { + if (cli_data->hid_sensor_hubs[i] == hid) { + struct request_list *new = kzalloc(sizeof(*new), GFP_KERNEL); +-- +2.43.0 + diff --git a/libre/linux-libre-rt/0003-fix-mvsdio-eMMC-timing.patch b/libre/linux-libre-rt/0003-fix-mvsdio-eMMC-timing.patch new file mode 100644 index 0000000..a447eaa --- /dev/null +++ b/libre/linux-libre-rt/0003-fix-mvsdio-eMMC-timing.patch @@ -0,0 +1,38 @@ +From 5b76d7e549a6f65f881ef832cb39ae6a4ad34119 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Fri, 5 Sep 2014 15:43:56 -0600 +Subject: [PATCH 3/7] fix mvsdio eMMC timing + +These changes from Globalscale change the MMC timing to allow the eMMC versions +of the Mirabox and SMILE Plug to work. + +Signed-off-by: Kevin Mihelich +--- + drivers/mmc/host/mvsdio.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c +index 629efbe639c4..c507c064736c 100644 +--- a/drivers/mmc/host/mvsdio.c ++++ b/drivers/mmc/host/mvsdio.c +@@ -90,7 +90,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data) + tmout_index = fls(tmout - 1) - 12; + if (tmout_index < 0) + tmout_index = 0; +- if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX) ++// if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX) //by steven, try to setup the timeout to maximum value + tmout_index = MVSD_HOST_CTRL_TMOUT_MAX; + + dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n", +@@ -613,6 +613,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) + u32 m = DIV_ROUND_UP(host->base_clock, ios->clock) - 1; + if (m > MVSD_BASE_DIV_MAX) + m = MVSD_BASE_DIV_MAX; ++ if(ios->clock==50000000 ) //by steven ++ m=1; + mvsd_write(MVSD_CLK_DIV, m); + host->clock = ios->clock; + host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); +-- +2.37.0 + diff --git a/libre/linux-libre-rt/0004-Revert-wifi-cfg80211-fix-CQM-for-non-range-use.patch b/libre/linux-libre-rt/0004-Revert-wifi-cfg80211-fix-CQM-for-non-range-use.patch new file mode 100644 index 0000000..5ae067c --- /dev/null +++ b/libre/linux-libre-rt/0004-Revert-wifi-cfg80211-fix-CQM-for-non-range-use.patch @@ -0,0 +1,140 @@ +From cd906594e5fdf1065975f2a89ce45c066c9f02a3 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Mon, 11 Dec 2023 10:16:15 +0100 +Subject: [PATCH 4/5] Revert "wifi: cfg80211: fix CQM for non-range use" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 4a7e92551618f3737b305f62451353ee05662f57 which is +commit 7e7efdda6adb385fbdfd6f819d76bc68c923c394 upstream. + +It needed to have commit 076fc8775daf ("wifi: cfg80211: remove wdev +mutex") applied to properly work, otherwise regressions happen. + +Link: https://lore.kernel.org/r/e374bb16-5b13-44cc-b11a-2f4eefb1ecf5@manjaro.org +Link: https://lore.kernel.org/r/87sf4belmm.fsf@turtle.gmx.de +Link: https://lore.kernel.org/r/20231210213930.61378-1-leo@leolam.fr +Reported-by: Léo Lam +Reported-by: Sven Joachim +Reported-by: Philip Müller +Cc: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +Cherry-picked-for: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/17 +--- + net/wireless/core.h | 1 - + net/wireless/nl80211.c | 50 ++++++++++++++++-------------------------- + 2 files changed, 19 insertions(+), 32 deletions(-) + +diff --git a/net/wireless/core.h b/net/wireless/core.h +index f0a3a2317638..e536c0b615a0 100644 +--- a/net/wireless/core.h ++++ b/net/wireless/core.h +@@ -299,7 +299,6 @@ struct cfg80211_cqm_config { + u32 rssi_hyst; + s32 last_rssi_event_value; + enum nl80211_cqm_rssi_threshold_event last_rssi_event_type; +- bool use_range_api; + int n_rssi_thresholds; + s32 rssi_thresholds[] __counted_by(n_rssi_thresholds); + }; +diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c +index 6a82dd876f27..931a03f4549c 100644 +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -12824,6 +12824,10 @@ static int cfg80211_cqm_rssi_update(struct cfg80211_registered_device *rdev, + int i, n, low_index; + int err; + ++ /* RSSI reporting disabled? */ ++ if (!cqm_config) ++ return rdev_set_cqm_rssi_range_config(rdev, dev, 0, 0); ++ + /* + * Obtain current RSSI value if possible, if not and no RSSI threshold + * event has been received yet, we should receive an event after a +@@ -12898,6 +12902,18 @@ static int nl80211_set_cqm_rssi(struct genl_info *info, + wdev->iftype != NL80211_IFTYPE_P2P_CLIENT) + return -EOPNOTSUPP; + ++ if (n_thresholds <= 1 && rdev->ops->set_cqm_rssi_config) { ++ if (n_thresholds == 0 || thresholds[0] == 0) /* Disabling */ ++ return rdev_set_cqm_rssi_config(rdev, dev, 0, 0); ++ ++ return rdev_set_cqm_rssi_config(rdev, dev, ++ thresholds[0], hysteresis); ++ } ++ ++ if (!wiphy_ext_feature_isset(&rdev->wiphy, ++ NL80211_EXT_FEATURE_CQM_RSSI_LIST)) ++ return -EOPNOTSUPP; ++ + if (n_thresholds == 1 && thresholds[0] == 0) /* Disabling */ + n_thresholds = 0; + +@@ -12905,20 +12921,6 @@ static int nl80211_set_cqm_rssi(struct genl_info *info, + old = rcu_dereference_protected(wdev->cqm_config, + lockdep_is_held(&wdev->mtx)); + +- /* if already disabled just succeed */ +- if (!n_thresholds && !old) +- return 0; +- +- if (n_thresholds > 1) { +- if (!wiphy_ext_feature_isset(&rdev->wiphy, +- NL80211_EXT_FEATURE_CQM_RSSI_LIST) || +- !rdev->ops->set_cqm_rssi_range_config) +- return -EOPNOTSUPP; +- } else { +- if (!rdev->ops->set_cqm_rssi_config) +- return -EOPNOTSUPP; +- } +- + if (n_thresholds) { + cqm_config = kzalloc(struct_size(cqm_config, rssi_thresholds, + n_thresholds), +@@ -12933,26 +12935,13 @@ static int nl80211_set_cqm_rssi(struct genl_info *info, + memcpy(cqm_config->rssi_thresholds, thresholds, + flex_array_size(cqm_config, rssi_thresholds, + n_thresholds)); +- cqm_config->use_range_api = n_thresholds > 1 || +- !rdev->ops->set_cqm_rssi_config; + + rcu_assign_pointer(wdev->cqm_config, cqm_config); +- +- if (cqm_config->use_range_api) +- err = cfg80211_cqm_rssi_update(rdev, dev, cqm_config); +- else +- err = rdev_set_cqm_rssi_config(rdev, dev, +- thresholds[0], +- hysteresis); + } else { + RCU_INIT_POINTER(wdev->cqm_config, NULL); +- /* if enabled as range also disable via range */ +- if (old->use_range_api) +- err = rdev_set_cqm_rssi_range_config(rdev, dev, 0, 0); +- else +- err = rdev_set_cqm_rssi_config(rdev, dev, 0, 0); + } + ++ err = cfg80211_cqm_rssi_update(rdev, dev, cqm_config); + if (err) { + rcu_assign_pointer(wdev->cqm_config, old); + kfree_rcu(cqm_config, rcu_head); +@@ -19142,11 +19131,10 @@ void cfg80211_cqm_rssi_notify_work(struct wiphy *wiphy, struct wiphy_work *work) + wdev_lock(wdev); + cqm_config = rcu_dereference_protected(wdev->cqm_config, + lockdep_is_held(&wdev->mtx)); +- if (!cqm_config) ++ if (!wdev->cqm_config) + goto unlock; + +- if (cqm_config->use_range_api) +- cfg80211_cqm_rssi_update(rdev, wdev->netdev, cqm_config); ++ cfg80211_cqm_rssi_update(rdev, wdev->netdev, cqm_config); + + rssi_level = cqm_config->last_rssi_event_value; + rssi_event = cqm_config->last_rssi_event_type; +-- +2.43.0 + diff --git a/libre/linux-libre-rt/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/libre/linux-libre-rt/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch new file mode 100644 index 0000000..b487155 --- /dev/null +++ b/libre/linux-libre-rt/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -0,0 +1,95 @@ +From 824cc151d839ce92269200119f9148013755adb8 Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Tue, 18 Feb 2014 01:43:50 -0300 +Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter + +--- + drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + +diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c +index bfb58c91db04..29b7c4cb90f1 100644 +--- a/drivers/net/usb/smsc95xx.c ++++ b/drivers/net/usb/smsc95xx.c +@@ -54,6 +54,7 @@ + #define SUSPEND_SUSPEND3 (0x08) + #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ + SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) ++#define MAC_ADDR_LEN (6) + + #define SMSC95XX_NR_IRQS (1) /* raise to 12 for GPIOs */ + #define PHY_HWIRQ (SMSC95XX_NR_IRQS - 1) +@@ -78,6 +79,10 @@ static bool turbo_mode = true; + module_param(turbo_mode, bool, 0644); + MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); + ++static char *macaddr = ":"; ++module_param(macaddr, charp, 0); ++MODULE_PARM_DESC(macaddr, "MAC address"); ++ + static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index, + u32 *data) + { +@@ -761,8 +766,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) + return phy_mii_ioctl(netdev->phydev, rq, cmd); + } + ++/* Check the macaddr module parameter for a MAC address */ ++static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac) ++{ ++ int i, j, got_num, num; ++ u8 mtbl[MAC_ADDR_LEN]; ++ ++ if (macaddr[0] == ':') ++ return 0; ++ ++ i = 0; ++ j = 0; ++ num = 0; ++ got_num = 0; ++ while (j < MAC_ADDR_LEN) { ++ if (macaddr[i] && macaddr[i] != ':') { ++ got_num++; ++ if ('0' <= macaddr[i] && macaddr[i] <= '9') ++ num = num * 16 + macaddr[i] - '0'; ++ else if ('A' <= macaddr[i] && macaddr[i] <= 'F') ++ num = num * 16 + 10 + macaddr[i] - 'A'; ++ else if ('a' <= macaddr[i] && macaddr[i] <= 'f') ++ num = num * 16 + 10 + macaddr[i] - 'a'; ++ else ++ break; ++ i++; ++ } else if (got_num == 2) { ++ mtbl[j++] = (u8) num; ++ num = 0; ++ got_num = 0; ++ i++; ++ } else { ++ break; ++ } ++ } ++ ++ if (j == MAC_ADDR_LEN) { ++ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: " ++ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2], ++ mtbl[3], mtbl[4], mtbl[5]); ++ for (i = 0; i < MAC_ADDR_LEN; i++) ++ dev_mac[i] = mtbl[i]; ++ return 1; ++ } else { ++ return 0; ++ } ++} ++ + static void smsc95xx_init_mac_address(struct usbnet *dev) + { ++ /* Check module parameters */ ++ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr)) ++ return; ++ + u8 addr[ETH_ALEN]; + + /* maybe the boot loader passed the MAC address in devicetree */ +-- +2.37.0 + diff --git a/libre/linux-libre-rt/0005-Set-distribution-specific-version.patch b/libre/linux-libre-rt/0005-Set-distribution-specific-version.patch new file mode 100644 index 0000000..3bea6e3 --- /dev/null +++ b/libre/linux-libre-rt/0005-Set-distribution-specific-version.patch @@ -0,0 +1,38 @@ +From 556a05b87c58b0e7dafa3107d7534dfcbdcf00ee Mon Sep 17 00:00:00 2001 +From: David Runge +Date: Sun, 18 Jun 2023 10:28:50 +0200 +Subject: [PATCH 5/5] Set distribution specific version + +Remove upstream's localversion file and instead append our distribution +specific identifier using `EXTRAVERSION`. + +Signed-off-by: David Runge +--- + Makefile | 2 +- + localversion-rt | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + delete mode 100644 localversion-rt + +diff --git a/Makefile b/Makefile +index ee4e504a3e78..a8ac0fdc967d 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + VERSION = 6 + PATCHLEVEL = 6 + SUBLEVEL = 5 +-EXTRAVERSION = ++EXTRAVERSION = .16.realtime1 + NAME = Hurr durr I'ma ninja sloth + + # *DOCUMENTATION* +diff --git a/localversion-rt b/localversion-rt +deleted file mode 100644 +index 1199ebade17b..000000000000 +--- a/localversion-rt ++++ /dev/null +@@ -1 +0,0 @@ +--rt16 +-- +2.43.0 + diff --git a/libre/linux-libre-rt/PKGBUILD b/libre/linux-libre-rt/PKGBUILD new file mode 100644 index 0000000..2c4ee16 --- /dev/null +++ b/libre/linux-libre-rt/PKGBUILD @@ -0,0 +1,512 @@ +# Maintainer: David P. + +# Based on linux-rt package + +_replacesarchkernel=('linux%') # '%' gets replaced with kernel suffix +_replacesoldkernels=() # '%' gets replaced with kernel suffix +_replacesoldmodules=() # '%' gets replaced with kernel suffix + +pkgbase=linux-libre-rt +_kver=6.6.5 +_rtver=16 +pkgver=$_kver.$_rtver.realtime1 +pkgrel=1 +pkgdesc='Linux-libre RT' +url='https://linux-libre.fsfla.org/' +arch=(i686 x86_64 armv7h) +makedepends=( + bc + cpio + gettext + libelf + pahole + perl + python + tar + xz + + # htmldocs + graphviz + imagemagick + python-sphinx + texlive-latexextra +) +options=('!strip') +_srcname=linux-6.6 +source=( + "https://cdn.kernel.org/pub/linux/kernel/projects/rt/${_srcname##*-}/older/patch-$_kver-rt$_rtver.patch"{.xz,.sign} + "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} + "https://linux-libre.fsfla.org/pub/linux-libre/releases/$_kver-gnu/patch-${_srcname##*-}-gnu-$_kver-gnu.xz"{,.sign} + "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig} + config.i686 config.x86_64 config.armv7h # the main kernel config files + linux-armv7h.preset # armv7h preset file for mkinitcpio ramdisk + + # maintain the TTY over USB disconnects + # http://www.coreboot.org/EHCI_Gadget_Debug + 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch + # fix Atmel maXTouch touchscreen support + # https://labs.parabola.nu/issues/877 + # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html + 0002-fix-Atmel-maXTouch-touchscreen-support.patch + # Arch Linux patches + # https://gitlab.archlinux.org/archlinux/packaging/upstream/linux-rt + 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch + 0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch + 0003-HID-amd_sfh-Check-that-sensors-are-enabled-before-se.patch + 0004-Revert-wifi-cfg80211-fix-CQM-for-non-range-use.patch + 0005-Set-distribution-specific-version.patch +) +source_i686=( + # avoid using zstd compression in ultra mode (exhausts virtual memory) + no-ultra-zstd.patch +) +source_armv7h=( + # Arch Linux ARM patches + 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch + 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch + 0003-fix-mvsdio-eMMC-timing.patch + 0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch + #0005-set-default-cubietruck-led-triggers.patch + #0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch + #0007-USB-Armory-MkII-support.patch +) +validpgpkeys=( + 474402C8C582DAFBE389C427BCB7CF877E7D47A7 # Alexandre Oliva + 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 # David P. + 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 # Sebastian Andrzej Siewior +) +sha256sums=('08c112c9365ee852763c0bb73d6ae5dfd0a2091275fcfe298a137515e5a8c74b' + 'SKIP' + 'd71785bdb694fefaa4f183e5dd2ffc453c179db6f9427cc37e1ed046f0073ccf' + 'SKIP' + '23bb9ff3579fa125486fbcf1cc1eda8d3d9e87238ea152c8a12f740b5c9d00de' + 'SKIP' + 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' + 'SKIP' + '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' + 'SKIP' + '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' + 'SKIP' + 'e3eb78843cd229c84c4e225a5bf7b79395a5917f745c977c064449b9c7ee05e8' + 'db0a4f014c072efdbda4ade6ac47cab2a3c75a4821b2bb18c2c55f21dd33d541' + 'd5a8adaa3c3cbc7143ae25ebb7eb207e55f6273312496f73085139d7c2ebfdfc' + 'ca1708abbd2f8960c278722dc81a7c635973d92872386ad9e2fff10b86836e98' + '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' + '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25' + '9be2358b18d9715f8d525edeec5ec011ad7d6e8d7b5360cfcd0854912ad7f47e' + '68a4845043f442d65ea87992b96bca9997bf3eca2644611c65ef62eb6e889ed7' + '412fc11fd909e7b22daecf7a5f3df13e2a6e681e814e83e57cb624402d33c31c' + 'fbcadedb198711a3ea838db17d582efb455a4dab644f4d6552375f35112b368c' + '02b32a95dd171c76f0246368cc68b837ac36aff307f6323659f5136fe018ff5f') +sha256sums_i686=('d32270be5fd9c3e3ba50f3aef33f6cfcb85be0c8216f03b777287cc621fdff28') +sha256sums_armv7h=('ef4661a32234fe12bda28e698400c78c11491387df83ee554c53afb4dba244da' + 'd3a4b7c7a3d3b4d69369b85630eef33b21cfbcffc23adbdc3cfa837610912287' + '2bce52fa4ae4d34ca171d3aa100302a920c231275fc3ba9141af8b2f68cf67d1' + '12d5706b00d2939b92130a4dc41d060f5e1fea75424b902ebceca72e427dc3b9') +b2sums=('eea23d87f4e42c6b67fd02b17c3f7adfad84294d559a0df661e64c339ca5d6f9c50bfa985755da1a83812d03d3db882cac1767e433e7878eb39fe4482280dd70' + 'SKIP' + 'e3e753fed07258f34e2e44e1acd4be0c22a3c58a3ae4856b518a4f99358f5bf6e8f38e41f422d9a434b33b0d7ee972e93ac7d37c9734949d6db263afe4c4f47c' + 'SKIP' + 'c845ccf80eed695bbb9efab5d13742c04f102348617ee784929fc04530b46e374ee17e44985012b1a5472ea8de4b8a47f79d5f1863885b13901d901e46b2fee2' + 'SKIP' + '73fee2ae5cb1ffd3e6584e56da86a8b1ff6c713aae54d77c0dab113890fc673dc5f300eb9ed93fb367b045ece8fa80304ff277fe61665eccf7b7ce24f0c045eb' + 'SKIP' + 'd02a1153a4285b32c774dca4560fe37907ccf30b8e487a681b717ed95ae9bed5988875c0a118938e5885ae9d2857e53a6f216b732b6fa3368e3c5fe08c86382c' + 'SKIP' + '580911af9431c066bbc072fd22d5e2ef65f12d8358cec5ff5a4f1b7deebb86cef6b5c1ad631f42350af72c51d44d2093c71f761234fb224a8b9dbb3b64b8201d' + 'SKIP' + 'b130326fbe2481955ec240af39bcd89c8c20e10c86fe869c8455c8c47957d3ba232267cd42183b5261c82d010589f84b5d7a71f653d3b2b99654c04a8856ecca' + '20adf14ffbc1cfeb3893d95c63b30143cf8b001543f0b9a8367b3cc8e520f6cfcc6c30d0fb83a4214e76728aa0ffe0488bae373791668bfcaf8e18f7462e6374' + '40e9266a1802002a0eb3e30ee82409a46f70eb6fd6bb2e1f5c44e21483db058a4b94b1a09ffe41ea7d0ce341d2c0ebe33db226ee341df01fdf056675e6d034a6' + 'af69176b1117b94e56b043e97b0bd5873a2974a6a2fd52b102d0ffdca440ff68cfb241d6c4d4ef453cc8c220c236b739bad232e53fd500ce7672fa6e5ba87383' + 'c2214154c36900e311531bfe68184f31639f5c50fed23bc3803a7f18439b7ff258552a39f02fed0ea92f10744e17a6c55cef0ef1a98187f978fe480fb3dddc14' + '0c7ceba7cd90087db3296610a07886f337910bad265a32c052d3a703e6eb8e53f355ab9948d72d366408d968d8ee7435084dd89bef5ed0b69355fd884c2cd468' + 'a54310fda8f1bc0dc68aa2b90c1d64086e61d74171224d784c658a00ce3aa464c4e3398482dd2f4ee21069a8854f1315b7101dd41f3d6a94d5b2b4c0e0ad63dc' + '5050a1cbf5ddb45df001554eaa8c8aa65ce9d75af4220c8b74cb515f4ce0201468eea7840bfaf8dbda7c05bfdfa5df5b7ab498416cd890c8d18ecc3a375c0b42' + '65df2e904af1f839125d00758022be03838b32b1f48585ff9726f5deb01422542b902deac2cbe9f48ac242b7a1056440109f199b9a9698f5746ebb6874133538' + '88109f36e8e535a0232625ecb446f5b05f1698f495ed4c405397077fdb80cd584c0417bf0a3403fe6aa89be7ed9f8f972822fba6ac5a35b4f77f2aa92b732932' + 'e13ed69f4e5e090acbd3ad618fcba69ce14fd7b4f7949653d15d5e305511b2b47d12bf02904860e2af20fc453632d249550f5eea765bf969fdf668871b7d3ca2') +b2sums_i686=('165ab9dd8cedeaae5327accc1581c19cf0be55f923b03feb889cad3351b74c7c4cd3d3c206938e5152bfe1d947513dea8f630f8f5544099ec13d16d254725c40') +b2sums_armv7h=('73ecc5862c6b4aef7b163c1992004273fbf791b82c75a8602e3def311f682f2b866124c0bfde90d03c7c76bb8b5853bdb9daad6ee2ab0908f4145cda476b8286' + '15f7b70b5d153e9336006aba873a78f94d91b8df5e1939041f12e678bb9cfbdda2e362001068a07c044ce606cf0d4d2e625002df9c569c914f7ac248d4d3e8ad' + '6219cec826bc543000ab87cf35dcc713f0635519cf79e75888b213a5e2d1f728e59e70df7fd842dda6e40494bf9cafa9f87368cb75b338c5a157a0adcf583512' + '66d6cff292962c4c8bbea62b2240c4c53c0c514f9e99864be9244cb846c505e1bedd800ca1347b80883543035d20573b06796e5bacbace6e829880695ffca781') + +_replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") +_replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}") +_replacesoldmodules=("${_replacesoldmodules[@]/\%/${pkgbase#linux-libre}}") + +case "$CARCH" in + i686|x86_64) KARCH=x86;; + armv7h) KARCH=arm;; +esac + +export KBUILD_BUILD_HOST=parabola +export KBUILD_BUILD_USER=$pkgbase +export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})" + +prepare() { + cd $_srcname + + if [ "${_srcname##*-}" != "$_kver" ]; then + echo "Applying upstream patch..." + patch -Np1 < "../patch-${_srcname##*-}-gnu-$_kver-gnu" + fi + + echo "Adding freedo as boot logo..." + install -m644 -t drivers/video/logo \ + ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm} + + echo "Setting version..." + echo "-$pkgrel" > localversion.10-pkgrel + echo "${pkgbase#linux-libre}" > localversion.20-pkgname + + sed '/^EXTRAVERSION =/s/= .*/=/' -i Makefile + + local source=("${source[@]}") + case "$CARCH" in + "armv7h") + source+=("${source_armv7h[@]}") ;; + "i686") + source+=("${source_i686[@]}") ;; + esac + + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + # allow to pick up the RT patch + src="${src//patch.xz/patch}" + [[ $src = *.patch ]] || continue + echo "Applying patch $src..." + patch -Np1 < "../$src" + done + + echo "Setting config..." + cp ../config.$CARCH .config + make olddefconfig + diff -u ../config.$CARCH .config || : + + make -s kernelrelease > version + echo "Prepared $pkgbase version $( $@ + + quiet_cmd_zstd22 = ZSTD22 $@ +- cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -22 --ultra > $@ ++ cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -19 > $@ + + quiet_cmd_zstd22_with_size = ZSTD22 $@ +- cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@ ++ cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@ + + # ASM offsets From a61940c5ed8c5129989dcac994d5db17612de684 Mon Sep 17 00:00:00 2001 From: David P Date: Jan 21 2024 01:43:12 +0000 Subject: [PATCH 69/73] updpkg: libre/linux-libre 6.7-1 Signed-off-by: David P. --- diff --git a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index 200467d..703f0dd 100644 --- a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 5356bd2edba31be92ea71b8fa2167e2bc3b60fbc Mon Sep 17 00:00:00 2001 +From 35d79b574508f84805b19ef3e1c4b21b9605e946 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -14,10 +14,10 @@ Our default behavior continues to match the vanilla kernel. 5 files changed, 53 insertions(+) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h -index 45f09bec02c4..87b20e2ee274 100644 +index 6030a8235617..60b7fe5fa74a 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h -@@ -148,6 +148,8 @@ static inline void set_userns_rlimit_max(struct user_namespace *ns, +@@ -156,6 +156,8 @@ static inline void set_userns_rlimit_max(struct user_namespace *ns, #ifdef CONFIG_USER_NS @@ -26,7 +26,7 @@ index 45f09bec02c4..87b20e2ee274 100644 static inline struct user_namespace *get_user_ns(struct user_namespace *ns) { if (ns) -@@ -181,6 +183,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); +@@ -189,6 +191,8 @@ extern bool current_in_userns(const struct user_namespace *target_ns); struct ns_common *ns_get_owner(struct ns_common *ns); #else @@ -36,7 +36,7 @@ index 45f09bec02c4..87b20e2ee274 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index 6d35728b94b2..0562c8ca7b30 100644 +index 9ffb103fc927..f91ccd3c1456 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1226,6 +1226,22 @@ config USER_NS @@ -63,7 +63,7 @@ index 6d35728b94b2..0562c8ca7b30 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index 177ce7438db6..6ecece1407fc 100644 +index 10917c3e1f03..458360cf9bfb 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -100,6 +100,10 @@ @@ -77,7 +77,7 @@ index 177ce7438db6..6ecece1407fc 100644 #include #include #include -@@ -2260,6 +2264,10 @@ __latent_entropy struct task_struct *copy_process( +@@ -2265,6 +2269,10 @@ __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -88,7 +88,7 @@ index 177ce7438db6..6ecece1407fc 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3413,6 +3421,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3411,6 +3419,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,7 +102,7 @@ index 177ce7438db6..6ecece1407fc 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 354a2d294f52..5bc5605e7cdb 100644 +index 157f7ce2942d..881fc4f5d61e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -80,6 +80,9 @@ @@ -132,7 +132,7 @@ index 354a2d294f52..5bc5605e7cdb 100644 { .procname = "tainted", diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 1d8e47bed3f1..fec01d016a35 100644 +index eabe8bcc7042..ac9d1f702086 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -22,6 +22,13 @@ @@ -146,7 +146,7 @@ index 1d8e47bed3f1..fec01d016a35 100644 +int unprivileged_userns_clone; +#endif + - static struct kmem_cache *user_ns_cachep __read_mostly; + static struct kmem_cache *user_ns_cachep __ro_after_init; static DEFINE_MUTEX(userns_state_mutex); -- diff --git a/libre/linux-libre/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch b/libre/linux-libre/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch index 3d2d12a..ae1a13a 100644 --- a/libre/linux-libre/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch +++ b/libre/linux-libre/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch @@ -1,7 +1,7 @@ -From 71702f17b7826fda819d56e329680eb655344fcb Mon Sep 17 00:00:00 2001 +From d7cb932d45ed4d5560fc0a96a8e3728debf5fe90 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Thu, 19 May 2022 14:40:07 +0200 -Subject: [PATCH 2/2] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 +Subject: [PATCH 2/4] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set The Nvidia proprietary driver has some bugs that leads to issues if used diff --git a/libre/linux-libre/0003-wifi-ath11k-rely-on-mac80211-debugfs-handling-for-vi.patch b/libre/linux-libre/0003-wifi-ath11k-rely-on-mac80211-debugfs-handling-for-vi.patch new file mode 100644 index 0000000..e6280b2 --- /dev/null +++ b/libre/linux-libre/0003-wifi-ath11k-rely-on-mac80211-debugfs-handling-for-vi.patch @@ -0,0 +1,163 @@ +From 7c13cc521f78fd261de3001dac48fd572baae671 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Thu, 11 Jan 2024 18:06:29 +0100 +Subject: [PATCH 3/4] wifi: ath11k: rely on mac80211 debugfs handling for vif + +mac80211 started to delete debugfs entries in certain cases, causing a +conflict between ath11k also trying to delete them later on. Fix this by +relying on mac80211 to delete the entries when appropriate and adding +them from the vif_add_debugfs handler. + +Fixes: 0a3d898ee9a8 ("wifi: mac80211: add/remove driver debugfs entries as appropriate") +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=218364 +Signed-off-by: Benjamin Berg +Cherry-picked-for: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/18 +--- + drivers/net/wireless/ath/ath11k/core.h | 4 ---- + drivers/net/wireless/ath/ath11k/debugfs.c | 25 +++++++++-------------- + drivers/net/wireless/ath/ath11k/debugfs.h | 12 ++--------- + drivers/net/wireless/ath/ath11k/mac.c | 12 +---------- + 4 files changed, 13 insertions(+), 40 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h +index f12b606e2d2e..667d55e26156 100644 +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -368,10 +368,6 @@ struct ath11k_vif { + struct ieee80211_chanctx_conf chanctx; + struct ath11k_arp_ns_offload arp_ns_offload; + struct ath11k_rekey_data rekey_data; +- +-#ifdef CONFIG_ATH11K_DEBUGFS +- struct dentry *debugfs_twt; +-#endif /* CONFIG_ATH11K_DEBUGFS */ + }; + + struct ath11k_vif_iter { +diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c +index be76e7d1c436..3ba6aa077e36 100644 +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -1893,35 +1893,30 @@ static const struct file_operations ath11k_fops_twt_resume_dialog = { + .open = simple_open + }; + +-void ath11k_debugfs_add_interface(struct ath11k_vif *arvif) ++void ath11k_debugfs_op_add_interface(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif) + { ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); + struct ath11k_base *ab = arvif->ar->ab; ++ struct dentry *debugfs_twt; + + if (arvif->vif->type != NL80211_IFTYPE_AP && + !(arvif->vif->type == NL80211_IFTYPE_STATION && + test_bit(WMI_TLV_SERVICE_STA_TWT, ab->wmi_ab.svc_map))) + return; + +- arvif->debugfs_twt = debugfs_create_dir("twt", +- arvif->vif->debugfs_dir); +- debugfs_create_file("add_dialog", 0200, arvif->debugfs_twt, ++ debugfs_twt = debugfs_create_dir("twt", ++ arvif->vif->debugfs_dir); ++ debugfs_create_file("add_dialog", 0200, debugfs_twt, + arvif, &ath11k_fops_twt_add_dialog); + +- debugfs_create_file("del_dialog", 0200, arvif->debugfs_twt, ++ debugfs_create_file("del_dialog", 0200, debugfs_twt, + arvif, &ath11k_fops_twt_del_dialog); + +- debugfs_create_file("pause_dialog", 0200, arvif->debugfs_twt, ++ debugfs_create_file("pause_dialog", 0200, debugfs_twt, + arvif, &ath11k_fops_twt_pause_dialog); + +- debugfs_create_file("resume_dialog", 0200, arvif->debugfs_twt, ++ debugfs_create_file("resume_dialog", 0200, debugfs_twt, + arvif, &ath11k_fops_twt_resume_dialog); + } + +-void ath11k_debugfs_remove_interface(struct ath11k_vif *arvif) +-{ +- if (!arvif->debugfs_twt) +- return; +- +- debugfs_remove_recursive(arvif->debugfs_twt); +- arvif->debugfs_twt = NULL; +-} +diff --git a/drivers/net/wireless/ath/ath11k/debugfs.h b/drivers/net/wireless/ath/ath11k/debugfs.h +index 3af0169f6cf2..b0bdd5e5f82b 100644 +--- a/drivers/net/wireless/ath/ath11k/debugfs.h ++++ b/drivers/net/wireless/ath/ath11k/debugfs.h +@@ -306,8 +306,8 @@ static inline int ath11k_debugfs_rx_filter(struct ath11k *ar) + return ar->debug.rx_filter; + } + +-void ath11k_debugfs_add_interface(struct ath11k_vif *arvif); +-void ath11k_debugfs_remove_interface(struct ath11k_vif *arvif); ++void ath11k_debugfs_op_add_interface(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif); + void ath11k_debugfs_add_dbring_entry(struct ath11k *ar, + enum wmi_direct_buffer_module id, + enum ath11k_dbg_dbr_event event, +@@ -386,14 +386,6 @@ static inline int ath11k_debugfs_get_fw_stats(struct ath11k *ar, + return 0; + } + +-static inline void ath11k_debugfs_add_interface(struct ath11k_vif *arvif) +-{ +-} +- +-static inline void ath11k_debugfs_remove_interface(struct ath11k_vif *arvif) +-{ +-} +- + static inline void + ath11k_debugfs_add_dbring_entry(struct ath11k *ar, + enum wmi_direct_buffer_module id, +diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c +index 7f7b39817773..6acf11fafb22 100644 +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -6750,13 +6750,6 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw, + goto err; + } + +- /* In the case of hardware recovery, debugfs files are +- * not deleted since ieee80211_ops.remove_interface() is +- * not invoked. In such cases, try to delete the files. +- * These will be re-created later. +- */ +- ath11k_debugfs_remove_interface(arvif); +- + memset(arvif, 0, sizeof(*arvif)); + + arvif->ar = ar; +@@ -6933,8 +6926,6 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw, + + ath11k_dp_vdev_tx_attach(ar, arvif); + +- ath11k_debugfs_add_interface(arvif); +- + if (vif->type != NL80211_IFTYPE_MONITOR && + test_bit(ATH11K_FLAG_MONITOR_CONF_ENABLED, &ar->monitor_flags)) { + ret = ath11k_mac_monitor_vdev_create(ar); +@@ -7050,8 +7041,6 @@ static void ath11k_mac_op_remove_interface(struct ieee80211_hw *hw, + /* Recalc txpower for remaining vdev */ + ath11k_mac_txpower_recalc(ar); + +- ath11k_debugfs_remove_interface(arvif); +- + /* TODO: recal traffic pause state based on the available vdevs */ + + mutex_unlock(&ar->conf_mutex); +@@ -9149,6 +9138,7 @@ static const struct ieee80211_ops ath11k_ops = { + #endif + + #ifdef CONFIG_ATH11K_DEBUGFS ++ .vif_add_debugfs = ath11k_debugfs_op_add_interface, + .sta_add_debugfs = ath11k_debugfs_sta_op_add, + #endif + +-- +2.43.0 + diff --git a/libre/linux-libre/0004-arch-Kconfig-Default-to-maximum-amount-of-ASLR-bits.patch b/libre/linux-libre/0004-arch-Kconfig-Default-to-maximum-amount-of-ASLR-bits.patch new file mode 100644 index 0000000..12de85f --- /dev/null +++ b/libre/linux-libre/0004-arch-Kconfig-Default-to-maximum-amount-of-ASLR-bits.patch @@ -0,0 +1,36 @@ +From 3a88b77d3cb9f9cd8a8aee052ab479b73aeb2e80 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sat, 13 Jan 2024 15:29:25 +0100 +Subject: [PATCH 4/4] arch/Kconfig: Default to maximum amount of ASLR bits + +To mitigate https://zolutal.github.io/aslrnt/; do this with a patch to +avoid having to enable `CONFIG_EXPERT`. +--- + arch/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/Kconfig b/arch/Kconfig +index f4b210ab0612..837d0dbb28ea 100644 +--- a/arch/Kconfig ++++ b/arch/Kconfig +@@ -1032,7 +1032,7 @@ config ARCH_MMAP_RND_BITS + int "Number of bits to use for ASLR of mmap base address" if EXPERT + range ARCH_MMAP_RND_BITS_MIN ARCH_MMAP_RND_BITS_MAX + default ARCH_MMAP_RND_BITS_DEFAULT if ARCH_MMAP_RND_BITS_DEFAULT +- default ARCH_MMAP_RND_BITS_MIN ++ default ARCH_MMAP_RND_BITS_MAX + depends on HAVE_ARCH_MMAP_RND_BITS + help + This value can be used to select the number of bits to use to +@@ -1066,7 +1066,7 @@ config ARCH_MMAP_RND_COMPAT_BITS + int "Number of bits to use for ASLR of mmap base address for compatible applications" if EXPERT + range ARCH_MMAP_RND_COMPAT_BITS_MIN ARCH_MMAP_RND_COMPAT_BITS_MAX + default ARCH_MMAP_RND_COMPAT_BITS_DEFAULT if ARCH_MMAP_RND_COMPAT_BITS_DEFAULT +- default ARCH_MMAP_RND_COMPAT_BITS_MIN ++ default ARCH_MMAP_RND_COMPAT_BITS_MAX + depends on HAVE_ARCH_MMAP_RND_COMPAT_BITS + help + This value can be used to select the number of bits to use to +-- +2.43.0 + diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index bc71aec..16c59c0 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -14,7 +14,7 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre -pkgver=6.6.8 +pkgver=6.7 pkgrel=1 pkgdesc='Linux-libre' url='https://linux-libre.fsfla.org/' @@ -58,6 +58,8 @@ source=( # Arch Linux patches 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch + 0003-wifi-ath11k-rely-on-mac80211-debugfs-handling-for-vi.patch + 0004-arch-Kconfig-Default-to-maximum-amount-of-ASLR-bits.patch ) source_i686=( # avoid using zstd compression in ultra mode (exhausts virtual memory) @@ -77,12 +79,12 @@ source_armv7h=( 0001-CHROMIUM-block-partitions-efi-Add-support-for-IGNORE.patch ) validpgpkeys=( - 474402C8C582DAFBE389C427BCB7CF877E7D47A7 # Alexandre Oliva - 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 # David P. + 474402C8C582DAFBE389C427BCB7CF877E7D47A7 # Alexandre Oliva + 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 # David P. ) sha256sums=('d71785bdb694fefaa4f183e5dd2ffc453c179db6f9427cc37e1ed046f0073ccf' 'SKIP' - '4193aba41ae2eed56059b7fe917fa0b933573578b7a71f4e0fdb7a4487075170' + '1bee0b26bd7f8c45dc9c9340ed3f64112ecbab357cb70757fb1db3ade3d8cb42' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -91,7 +93,7 @@ sha256sums=('d71785bdb694fefaa4f183e5dd2ffc453c179db6f9427cc37e1ed046f0073ccf' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' 'SKIP' '0e4aed294e60fc9ac397cff327a8b549e672d423bf71e4a2e53c62d36c60701c' - '62ddc229b843688d3b87d2bf17dcd49d718971b20307d9262bd1b6fc15ce9112' + 'b7596ff453859ac2621d91add29326a1312fd5549c9e4b34a21da0f58358f29f' 'b66961f28d8e01d4c0cb6bf9df6cc3edc89c7a3369f44bb718ff6a1d77f6fd74' 'ca1708abbd2f8960c278722dc81a7c635973d92872386ad9e2fff10b86836e98' '523d52a6fc9df4c43c8401f17cd796ebd281845d05358c9564a64d8c5a63f028' @@ -99,8 +101,10 @@ sha256sums=('d71785bdb694fefaa4f183e5dd2ffc453c179db6f9427cc37e1ed046f0073ccf' 'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b' '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25' - 'f42b4d1cbde46fd9c2e3b9baaecb0a50fab3aa423a621a7849c42b5ddbbfa9b8' - '1ee62f3e582ffb63323097ff0698572b33507d1ff3dd3c88f7071dfa7a22fc24') + '3acdbcbcc3eafb97463dd5e694043645df01361443cd16b60ae1c9b0d242f607' + '8f93ffd5de167320e5d0171a01bf3aa603f2abc751c524efb1ccc41209ccc698' + '78f051a2846b639ace90d9c0538a9f3631d8253574eeadd7be99837f103e93ba' + '48ee37cbe5ae6f66f30302bcc4daed1861af22fb96fdfd548dff8b7080deb48d') sha256sums_i686=('d32270be5fd9c3e3ba50f3aef33f6cfcb85be0c8216f03b777287cc621fdff28') sha256sums_armv7h=('ef4661a32234fe12bda28e698400c78c11491387df83ee554c53afb4dba244da' 'd3a4b7c7a3d3b4d69369b85630eef33b21cfbcffc23adbdc3cfa837610912287' @@ -109,7 +113,7 @@ sha256sums_armv7h=('ef4661a32234fe12bda28e698400c78c11491387df83ee554c53afb4dba2 'f4d4b44adc4b47b18bac33aa2c46b458c1b7ceb277416eff59054b6d7687c6da') b2sums=('e3e753fed07258f34e2e44e1acd4be0c22a3c58a3ae4856b518a4f99358f5bf6e8f38e41f422d9a434b33b0d7ee972e93ac7d37c9734949d6db263afe4c4f47c' 'SKIP' - '53cb120b0bc8bce90e19fce0a69d05ab3f69d07ce75976d2106e0edaf5699fb71f777b1913c1fc36075d9dc46d3f4bfa1f9e4f2e7901bae869c28d3642a0a93e' + '19255b0d4728aee015464446095ae1b924f8ee76932de03129ed8612a7ac47a45e7a3e2e64690b284ade97784d4e0365a93d75fcb3bd9b1058fcaf05cf2a650d' 'SKIP' '73fee2ae5cb1ffd3e6584e56da86a8b1ff6c713aae54d77c0dab113890fc673dc5f300eb9ed93fb367b045ece8fa80304ff277fe61665eccf7b7ce24f0c045eb' 'SKIP' @@ -118,7 +122,7 @@ b2sums=('e3e753fed07258f34e2e44e1acd4be0c22a3c58a3ae4856b518a4f99358f5bf6e8f38e4 '580911af9431c066bbc072fd22d5e2ef65f12d8358cec5ff5a4f1b7deebb86cef6b5c1ad631f42350af72c51d44d2093c71f761234fb224a8b9dbb3b64b8201d' 'SKIP' '196423ae81a8c359db0c70888b3117d126594699ddbf3033c69c5c2aba02d20f7349a48b9d8095c7d398024b10ef1f89f12b59421074cd57ac74d9462b0457d0' - 'afcb497e56fced76d797caee65a223ac59925d33514b79d5384f4b114647936791fe3cb77982fb2d88cfc47194e16f99d38ff6ee08c2d24ad70452238dcb26fa' + '48841cc2d4e9c3a16e3fe6c99c0e0b4f47d36212f92fee81c72ded01fc03687ca511fcca48a8bf00eeffb9cc54b4ea03b2fb0a360c030bd7165a2f53af204699' '5760e0879cf71dfc1c9bdd557829f28437909e701fa566cc3575a52785c81ac70d634ec929833ac01aea111bbae6ba402add738dc86623b32bcc3b523d43f60f' 'af69176b1117b94e56b043e97b0bd5873a2974a6a2fd52b102d0ffdca440ff68cfb241d6c4d4ef453cc8c220c236b739bad232e53fd500ce7672fa6e5ba87383' '9336fb5d1f98a77144673750b0f924b15b60e98e4bba0d13d1b1a5c977f14538f97143147081c94e0d8555b5dbd246fe0a410c7146a9b0866f3728176548fb0a' @@ -126,8 +130,10 @@ b2sums=('e3e753fed07258f34e2e44e1acd4be0c22a3c58a3ae4856b518a4f99358f5bf6e8f38e4 'aaa4e28a31967cc3a7fe25a86ba35fdfa210cd8b1a9cc96298349cbf01d60cdf146ee519d6803d05b175873f1b3367e47194a178db7ed97c802e59b38f8c303c' 'c2214154c36900e311531bfe68184f31639f5c50fed23bc3803a7f18439b7ff258552a39f02fed0ea92f10744e17a6c55cef0ef1a98187f978fe480fb3dddc14' '0c7ceba7cd90087db3296610a07886f337910bad265a32c052d3a703e6eb8e53f355ab9948d72d366408d968d8ee7435084dd89bef5ed0b69355fd884c2cd468' - '4f5df7bb477f09855294fd4afd6adedd97f1a96051d350a936cb3e061de9c599130e9db4a820d5b70086b8fac5e9e294ca2898fa924310c4fae684c2fbf9c5bc' - '9419a4ff2104313df9e40cd1e7f3f7629b4beec27e60b27c4935bb57a245c7b63189ffe38a70ca834d025708c489c623f2734a0e0b3260dde14e871c52455911') + '627ca26af83559e25922d0929a3ba0570c19d7afd3ac9a11af26b7638d6b9a48184a45991ce1a6c92877a584ef690c6eb0f5ef5fe8e4b49a1e4168ffe42b9995' + 'cd38684a43f644998affb855d37cba844f6e858ed0c2cdf667bad642f813f54890a8ee1dcbe5937c42e7f48befa2600195608d97897f671c7c091660d9c6462a' + '5b5211bd031a00dd6eeb59d3a159da42c34357336790e68906610b185f481a676aafa0d3180670b8eaf9a9c81c0689ada14ea558ea652ce19c5f3d955c4f930e' + 'f75c55e831217f3b3b000513c3b817893738bc9ccc76fdc836ded28153518c340de65b276f6e2a897728a60cfe1462d6885ca19325d13ec50f8dc19c8ae14618') b2sums_i686=('165ab9dd8cedeaae5327accc1581c19cf0be55f923b03feb889cad3351b74c7c4cd3d3c206938e5152bfe1d947513dea8f630f8f5544099ec13d16d254725c40') b2sums_armv7h=('73ecc5862c6b4aef7b163c1992004273fbf791b82c75a8602e3def311f682f2b866124c0bfde90d03c7c76bb8b5853bdb9daad6ee2ab0908f4145cda476b8286' '15f7b70b5d153e9336006aba873a78f94d91b8df5e1939041f12e678bb9cfbdda2e362001068a07c044ce606cf0d4d2e625002df9c569c914f7ac248d4d3e8ad' @@ -164,17 +170,16 @@ prepare() { echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux-libre}" > localversion.20-pkgname - local source_all + local source=("${source[@]}") case "$CARCH" in "armv7h") - source_all+=("${source_armv7h[@]}") ;; + source+=("${source_armv7h[@]}") ;; "i686") - source_all+=("${source_i686[@]}") ;; + source+=("${source_i686[@]}") ;; esac - source_all+=("${source[@]}") local src - for src in "${source_all[@]}"; do + for src in "${source[@]}"; do src="${src%%::*}" src="${src##*/}" src="${src%.zst}" @@ -249,7 +254,7 @@ _package() { make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install # armv7h presets only work with ALL_kver=$( Date: Jan 22 2024 20:12:11 +0000 Subject: [PATCH 70/73] updpkg: nonsystemd/pipewire 1:1.0.1-1.nonsystemd1 Signed-off-by: David P. --- diff --git a/nonsystemd/pipewire/0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch b/nonsystemd/pipewire/0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch deleted file mode 100644 index 650d2a0..0000000 --- a/nonsystemd/pipewire/0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Thu, 3 Aug 2023 20:53:49 +0200 -Subject: [PATCH] pipewire-jack: Disable LD_LIBRARY_PATH when libjack is in - libdir - -This avoids prepending /usr/lib to the LD_LIBRARY_PATH, which supersedes -DT_RUNPATH and can cause library confusion. ---- - pipewire-jack/src/meson.build | 7 +++++++ - pipewire-jack/src/pw-jack.in | 4 ++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build -index daa4bcdef1ae..def7746afe20 100644 ---- a/pipewire-jack/src/meson.build -+++ b/pipewire-jack/src/meson.build -@@ -21,12 +21,19 @@ libjack_path = get_option('libjack-path') - if libjack_path == '' - libjack_path = modules_install_dir / 'jack' - libjack_path_dlopen = modules_install_dir_dlopen / 'jack' -+ libjack_path_enable = '' -+elif libjack_path == get_option('libdir') or libjack_path == pipewire_libdir -+ libjack_path = pipewire_libdir -+ libjack_path_dlopen = libjack_path -+ libjack_path_enable = '#' - else - libjack_path_dlopen = libjack_path -+ libjack_path_enable = '' - endif - - tools_config = configuration_data() - tools_config.set('LIBJACK_PATH', libjack_path_dlopen) -+tools_config.set('LIBJACK_PATH_ENABLE', libjack_path_enable) - - configure_file(input : 'pw-jack.in', - output : 'pw-jack', -diff --git a/pipewire-jack/src/pw-jack.in b/pipewire-jack/src/pw-jack.in -index 2f232f6253b0..e9714284878a 100755 ---- a/pipewire-jack/src/pw-jack.in -+++ b/pipewire-jack/src/pw-jack.in -@@ -52,7 +52,7 @@ if [ -n "$PERIOD" ]; then - fi - export PIPEWIRE_QUANTUM - fi --LD_LIBRARY_PATH='@LIBJACK_PATH@'"${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}" --export LD_LIBRARY_PATH -+@LIBJACK_PATH_ENABLE@LD_LIBRARY_PATH='@LIBJACK_PATH@'"${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}" -+@LIBJACK_PATH_ENABLE@export LD_LIBRARY_PATH - - exec "$@" diff --git a/nonsystemd/pipewire/PKGBUILD b/nonsystemd/pipewire/PKGBUILD index 1f9f0ba..ad435ba 100644 --- a/nonsystemd/pipewire/PKGBUILD +++ b/nonsystemd/pipewire/PKGBUILD @@ -23,10 +23,13 @@ pkgname=( pipewire-zeroconf pipewire-v4l2 pipewire-x11-bell + pipewire-session-manager + pulse-native-provider ) -_commit=b5c3f217926f9066a1afbee7eb20967dd6896c56 # tags/0.3.79 -pkgver=0.3.79 -pkgrel=2 +_commit=79b98884af80329f59596906231da5597bcdb7b6 # tags/1.0.1 +pkgver=1.0.1 +_so_ver=0.3 +pkgrel=1 pkgrel+=.nonsystemd1 epoch=1 pkgdesc="Low-latency audio/video router and processor" @@ -69,7 +72,7 @@ makedepends=( sbc sdl2 valgrind - webrtc-audio-processing + webrtc-audio-processing-1 ) checkdepends=( desktop-file-utils @@ -79,12 +82,10 @@ source=( "git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit" artix-pipewire-launcher pipewire.desktop - 0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch ) b2sums=('SKIP' - '83eed9010ff2163a867bd06cfcc0dc6877b37799cd549baa23be8c17f6afdc4381c8623b73c4588090b1de973000bc48bd9b8bf24134faff60e4871471676962' - '9abebce63d8e877aa9b73cabdf786e71824681328511822dfbd213e3b4c94ac073d225a3c72dcaf96f9c0fa0fcfce67160778487e711b82d452d5570c00d7405' - '17de92c7209e4b927f1de7cf11aa5b7b92fbdd41cea26850ecd2159c393ee8a30a93b178681ab05b408fb2fffac111c29b5eebf41119d7ad8f5bbed7122fc3f3') + 'b24d6c83d6846dd9de8806ea5cd8da5745a13645cea6e0904c4ce6bfb2f018e189f698e2ff1d44e38538d1233b63fd3ad0c1492e3e3ed0d62ae78282ff696755' + '9571effe6042a51a9ef770000e65c1f35aaf56bb07eb191407b5038bdee209dd49572b5f457312ea6b6fbab1b04454468d1b9ad57d8fa7e4e0a94773e7c07197') pkgver() { cd pipewire @@ -93,9 +94,6 @@ pkgver() { prepare() { cd pipewire - - # remove export of LD_LIBRARY_PATH for pw-jack as it would add /usr/lib - git apply -3 ../0001-pipewire-jack-Disable-LD_LIBRARY_PATH-when-libjack-i.patch } build() { @@ -105,7 +103,9 @@ build() { -D jack-devel=true -D systemd=disabled -D libjack-path=/usr/lib + -D man=enabled -D rlimits-install=false + -D selinux=disabled -D session-managers=[] -D udevrulesdir=/usr/lib/udev/rules.d ) @@ -128,10 +128,8 @@ _pick() { done } -_ver=${pkgver:0:3} - package_pipewire() { - license+=(LGPL) # libspa-alsa + license+=(LGPL-2.1-or-later) # libspa-alsa depends=( gcc-libs glibc @@ -141,7 +139,7 @@ package_pipewire() { libdbus-1.so libglib-2.0.so libncursesw.so - libpipewire-$_ver.so + libpipewire-$_so_ver.so libreadline.so libudev.so ) @@ -174,9 +172,9 @@ package_pipewire() { ln -sf pipewire usr/bin/$_f done - _pick lib usr/include/{pipewire-$_ver,spa-0.2} - _pick lib usr/lib/libpipewire-$_ver.so* - _pick lib usr/lib/pkgconfig/lib{pipewire-$_ver,spa-0.2}.pc + _pick lib usr/include/{pipewire-$_so_ver,spa-0.2} + _pick lib usr/lib/libpipewire-$_so_ver.so* + _pick lib usr/lib/pkgconfig/lib{pipewire-$_so_ver,spa-0.2}.pc _pick acp usr/lib/udev _pick acp usr/share/alsa-card-profile @@ -188,26 +186,30 @@ package_pipewire() { _pick audio usr/bin/pw-{loopback,mididump} _pick audio usr/bin/spa-{acp-tool,resample} _pick audio usr/lib/alsa-lib - _pick audio usr/lib/pipewire-$_ver/libpipewire-module-avb.so - _pick audio usr/lib/pipewire-$_ver/libpipewire-module-echo-cancel.so - _pick audio usr/lib/pipewire-$_ver/libpipewire-module-fallback-sink.so - _pick audio usr/lib/pipewire-$_ver/libpipewire-module-filter-chain.so - _pick audio usr/lib/pipewire-$_ver/libpipewire-module-loopback.so - _pick audio usr/lib/pipewire-$_ver/libpipewire-module-netjack2-*.so - _pick audio usr/lib/pipewire-$_ver/libpipewire-module-pipe-tunnel.so - _pick audio usr/lib/pipewire-$_ver/libpipewire-module-protocol-simple.so - _pick audio usr/lib/pipewire-$_ver/libpipewire-module-rtp-{sap,sink,source}.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-avb.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-echo-cancel.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-fallback-sink.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-filter-chain*.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-loopback.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-netjack2-*.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-pipe-tunnel.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-protocol-simple.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-rtp-{sap,sink,source}.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-vban-{recv,send}.so _pick audio usr/lib/spa-0.2/{aec,alsa,audio*,avb,bluez5} _pick audio usr/share/alsa - _pick audio usr/share/man/man1/pw-{cat,mididump}.1 + _pick audio usr/share/man/man1/pw-{cat,loopback,mididump}.1 + _pick audio usr/share/man/man7/libpipewire-module-{avb,echo-cancel,fallback-sink,filter-chain*,loopback,netjack2*,pipe-tunnel,protocol-simple,rtp-{sap,sink,source},vban*}.7 _pick audio usr/share/pipewire/filter-chain* _pick audio usr/share/pipewire/pipewire-{aes67,avb}.conf _pick audio usr/share/spa-0.2/bluez5 - _pick ffado usr/lib/pipewire-$_ver/libpipewire-module-ffado*.so + _pick ffado usr/lib/pipewire-$_so_ver/libpipewire-module-ffado*.so + _pick ffado usr/share/man/man7/libpipewire-module-ffado-driver.7 - _pick jack-client usr/lib/pipewire-$_ver/libpipewire-module-jack{-tunnel,dbus-detect}.so + _pick jack-client usr/lib/pipewire-$_so_ver/libpipewire-module-jack{-tunnel,dbus-detect}.so _pick jack-client usr/lib/spa-0.2/jack + _pick jack-client usr/share/man/man7/libpipewire-module-jack{-tunnel,dbus-detect}.7 _pick jack usr/bin/pw-jack _pick jack usr/include/jack @@ -217,27 +219,34 @@ package_pipewire() { _pick jack usr/share/pipewire/jack.conf _pick pulse usr/bin/pipewire-pulse - _pick pulse usr/lib/pipewire-$_ver/libpipewire-module-protocol-pulse.so - _pick pulse usr/lib/pipewire-$_ver/libpipewire-module-pulse-tunnel.so + _pick pulse usr/lib/pipewire-$_so_ver/libpipewire-module-protocol-pulse.so + _pick pulse usr/lib/pipewire-$_so_ver/libpipewire-module-pulse-tunnel.so _pick pulse usr/share/man/man1/pipewire-pulse.1 + _pick pulse usr/share/man/man5/pipewire-pulse.conf.5 + _pick pulse usr/share/man/man7/pipewire-pulse*.7 + _pick pulse usr/share/man/man7/libpipewire-module-{protocol-pulse,pulse-tunnel}.7 _pick pulse usr/share/pipewire/pipewire-pulse.conf - _pick roc usr/lib/pipewire-$_ver/libpipewire-module-roc*.so + _pick roc usr/lib/pipewire-$_so_ver/libpipewire-module-roc*.so + _pick roc usr/share/man/man7/libpipewire-module-roc-{sink,source}.7 _pick gst usr/lib/gstreamer-1.0 - _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-{raop,zeroconf}-*.so - _pick zeroconf usr/lib/pipewire-$_ver/libpipewire-module-rtp-session.so + _pick zeroconf usr/lib/pipewire-$_so_ver/libpipewire-module-{raop,zeroconf}-*.so + _pick zeroconf usr/lib/pipewire-$_so_ver/libpipewire-module-rtp-session.so + _pick zeroconf usr/share/man/man7/libpipewire-module-{raop-*,rtp-session,zeroconf*}.7 - _pick v4l2 usr/bin/pw-v4l2 usr/lib/pipewire-$_ver/v4l2 + _pick v4l2 usr/bin/pw-v4l2 usr/lib/pipewire-$_so_ver/v4l2 - _pick x11-bell usr/lib/pipewire-$_ver/libpipewire-module-x11-bell.so + _pick x11-bell usr/lib/pipewire-$_so_ver/libpipewire-module-x11-bell.so + _pick x11-bell usr/share/man/man7/libpipewire-module-x11-bell.7 # directories for overrides mkdir -p etc/pipewire/{client-rt,client,minimal,pipewire}.conf.d ) install -Dm755 "$srcdir"/artix-pipewire-launcher "$pkgdir"/usr/bin/artix-pipewire-launcher install -Dm644 "$srcdir"/pipewire.desktop "$pkgdir"/etc/xdg/autostart/pipewire.desktop + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING } @@ -247,7 +256,7 @@ package_libpipewire() { glibc gcc-libs ) - provides=(libpipewire-$_ver.so) + provides=(libpipewire-$_so_ver.so) mv lib/* "$pkgdir" @@ -256,7 +265,7 @@ package_libpipewire() { package_alsa-card-profiles() { pkgdesc+=" - ALSA card profiles" - license=(LGPL) + license=(LGPL-2.1-or-later) mv acp/* "$pkgdir" } @@ -286,11 +295,11 @@ package_pipewire-audio() { liblilv-0.so libmysofa.so libopus.so - libpipewire-$_ver.so + libpipewire-$_so_ver.so libsbc.so libsndfile.so libusb-1.0.so - libwebrtc_audio_processing.so + libwebrtc-audio-processing-1.so pipewire ) @@ -328,7 +337,7 @@ package_pipewire-ffado() { depends=( glibc libffado.so - libpipewire-$_ver.so + libpipewire-$_so_ver.so pipewire pipewire-audio ) @@ -344,7 +353,7 @@ package_pipewire-jack-client() { glibc libdbus-1.so libjack.so - libpipewire-$_ver.so + libpipewire-$_so_ver.so pipewire pipewire-audio ) @@ -357,10 +366,10 @@ package_pipewire-jack-client() { package_pipewire-jack() { pkgdesc+=" - JACK replacement" - license+=(GPL2) # libjackserver + license+=(LGPL-2.1-or-later GPL-2.0-only) # libjackserver depends=( glibc - libpipewire-$_ver.so + libpipewire-$_so_ver.so pipewire pipewire-audio pipewire-session-manager @@ -389,14 +398,21 @@ package_pipewire-pulse() { glibc libavahi-{client,common}.so libglib-2.0.so - libpipewire-$_ver.so + libpipewire-$_so_ver.so libpulse.so pipewire pipewire-audio pipewire-session-manager ) - provides=(pulseaudio pulseaudio-bluetooth) - conflicts=(pulseaudio pulseaudio-bluetooth) + provides=( + pulse-native-provider + pulseaudio + pulseaudio-bluetooth + ) + conflicts=( + pulseaudio + pulseaudio-bluetooth + ) mv pulse/* "$pkgdir" @@ -413,7 +429,7 @@ package_pipewire-roc() { pkgdesc+=" - ROC streaming support" depends=( glibc - libpipewire-$_ver.so + libpipewire-$_so_ver.so libroc.so pipewire pipewire-audio @@ -432,7 +448,7 @@ package_gst-plugin-pipewire() { glibc gst-plugins-base-libs gstreamer - libpipewire-$_ver.so + libpipewire-$_so_ver.so pipewire pipewire-session-manager ) @@ -448,7 +464,7 @@ package_pipewire-zeroconf() { gcc-libs glibc libavahi-{client,common}.so - libpipewire-$_ver.so + libpipewire-$_so_ver.so openssl opus pipewire @@ -464,7 +480,7 @@ package_pipewire-v4l2() { pkgdesc+=" - V4L2 interceptor" depends=( glibc - libpipewire-$_ver.so + libpipewire-$_so_ver.so pipewire pipewire-session-manager sh @@ -480,7 +496,7 @@ package_pipewire-x11-bell() { depends=( glibc libcanberra.so - libpipewire-$_ver.so + libpipewire-$_so_ver.so libx11 libxfixes pipewire @@ -492,4 +508,14 @@ package_pipewire-x11-bell() { install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING } +package_pipewire-session-manager() { + pkgdesc="Session manager for PipeWire (default provider)" + depends=(wireplumber) +} + +package_pulse-native-provider() { + pkgdesc="PulseAudio sound server (default provider)" + depends=(pipewire-pulse) +} + # vim:set sw=2 sts=-1 et: diff --git a/nonsystemd/pipewire/artix-pipewire-launcher b/nonsystemd/pipewire/artix-pipewire-launcher index dd34b93..aafd84b 100644 --- a/nonsystemd/pipewire/artix-pipewire-launcher +++ b/nonsystemd/pipewire/artix-pipewire-launcher @@ -7,49 +7,43 @@ DATE_FORMAT='+%Y-%m-%dT%H:%M:%S%Z' CONF="${XDG_CONFIG_HOME}/artix-pipewire-launcher.conf" -if [ -f "${CONF}" ] -then - . "${CONF}" +if [ -f "${CONF}" ]; then + . "${CONF}" else - ARTIX_PIPEWIRE_LOG='/dev/null' - ARTIX_PIPEWIRE_PULSE_LOG='/dev/null' - ARTIX_WIREPLUMBER_LOG='/dev/null' + ARTIX_PIPEWIRE_LOG='/dev/null' + ARTIX_PIPEWIRE_PULSE_LOG='/dev/null' + ARTIX_WIREPLUMBER_LOG='/dev/null' fi for L in \ - "${ARTIX_PIPEWIRE_LOG}" \ - "${ARTIX_PIPEWIRE_PULSE_LOG}" \ - "${ARTIX_WIREPLUMBER_LOG}" -do - if [ ! -e "${L}" ] - then - touch "${L}" - fi + "${ARTIX_PIPEWIRE_LOG}" \ + "${ARTIX_PIPEWIRE_PULSE_LOG}" \ + "${ARTIX_WIREPLUMBER_LOG}"; do + if [ ! -e "${L}" ]; then + touch "${L}" + fi done -restart () { - echo "Terminating PipeWire processes ..." - pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1 - pwait -u "${USER}" -x pipewire\|wireplumber - echo "PipeWire terminated." +restart() { + echo "Terminating PipeWire processes ..." + pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1 + pidwait -u "${USER}" -x pipewire\|wireplumber + echo "PipeWire terminated." } -if [ "${#}" -gt 0 ] -then - if [ "${1}" = 'restart' ] - then - restart - else - echo "Unrecognised argument." >&2 - echo "Usage: artix-pipewire-launcher [restart]" >&2 - exit 1 - fi +if [ "${#}" -gt 0 ]; then + if [ "${1}" = 'restart' ]; then + restart + else + echo "Unrecognised argument." >&2 + echo "Usage: artix-pipewire-launcher [restart]" >&2 + exit 1 + fi fi -if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1 -then - echo "PipeWire already running, exiting." >&2 - echo "(Use 'artix-pipewire-launcher restart' to restart PipeWire and WirePlumber.)" >&2 - exit 1 +if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1; then + echo "PipeWire already running, exiting." >&2 + echo "(Use 'artix-pipewire-launcher restart' to restart PipeWire and WirePlumber.)" >&2 + exit 1 fi # The core daemon which by itself does probably nothing. diff --git a/nonsystemd/pipewire/pipewire.desktop b/nonsystemd/pipewire/pipewire.desktop index c40e47a..99661fd 100644 --- a/nonsystemd/pipewire/pipewire.desktop +++ b/nonsystemd/pipewire/pipewire.desktop @@ -2,7 +2,7 @@ Version=1.0 Name[de]=PipeWire Mediensystem Name=PipeWire Media System -Categories=Audio,AudioVideo +Categories=Audio;AudioVideo Comment[de]=Das PipeWire Mediensystem starten Comment=Start the PipeWire Media System Exec=/usr/bin/artix-pipewire-launcher restart From 453dd2ad4c98504243ad62b096ecbdb459aa8a69 Mon Sep 17 00:00:00 2001 From: David P Date: Jan 22 2024 20:12:26 +0000 Subject: [PATCH 71/73] updpkg: nonsystemd/wireplumber 0.4.17-1.nonsystemd1 Signed-off-by: David P. --- diff --git a/nonsystemd/wireplumber/PKGBUILD b/nonsystemd/wireplumber/PKGBUILD index d13d219..b74e402 100644 --- a/nonsystemd/wireplumber/PKGBUILD +++ b/nonsystemd/wireplumber/PKGBUILD @@ -1,114 +1,111 @@ # Maintainer: David P. -# Maintainer (Artix): Nathan +# Maintainer (Arch): David Runge # Maintainer (Arch): Jan Alexander Steffens (heftig) pkgbase=wireplumber pkgname=( - wireplumber - libwireplumber + wireplumber + libwireplumber ) -_commit=6d0c7f7b7f484b3cd2aaf2e2b3cc902c095b4946 # tags/0.4.14 -pkgver=0.4.14 +_commit=d3eb77b292655cef333a8f4cab4e861415bc37c2 # tags/0.4.17 +pkgver=0.4.17 pkgrel=1 +pkgrel+=.nonsystemd1 pkgdesc="Session / policy manager implementation for PipeWire" url="https://pipewire.pages.freedesktop.org/wireplumber/" arch=(x86_64) arch+=(armv7h i686) license=(MIT) makedepends=( - doxygen - elogind - git - glib2 - gobject-introspection - graphviz - lua - meson - pipewire - # python-breathe - python-lxml - # python-sphinx - # python-sphinx_rtd_theme + doxygen + elogind + git + glib2 + gobject-introspection + graphviz + lua + meson + pipewire + python-lxml ) -depends=('libelogind') checkdepends=(pipewire-audio) source=("git+https://gitlab.freedesktop.org/pipewire/$pkgbase.git#commit=$_commit") -sha256sums=('SKIP') +b2sums=('SKIP') pkgver() { - cd $pkgbase - git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' + cd $pkgbase + git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { - cd $pkgbase + cd $pkgbase } build() { - local meson_options=( - -D system-lua=true - -D systemd=disabled - -D doc=disabled - -D elogind=enabled - ) - - arch-meson $pkgbase build "${meson_options[@]}" - meson compile -C build + local meson_options=( + -D systemd=disabled + -D doc=disabled + -D elogind=enabled + -D system-lua=true + ) + + arch-meson $pkgbase build "${meson_options[@]}" + meson compile -C build } check() { - meson test -C build --print-errorlogs + meson test -C build --print-errorlogs } _pick() { - local p="$1" f d; shift - for f; do - d="$srcdir/$p/${f#$pkgdir/}" - mkdir -p "$(dirname "$d")" - mv "$f" "$d" - rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" - done + local p="$1" f d + shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done } _ver=${pkgver:0:3} package_wireplumber() { - depends=( - "libwireplumber=$pkgver-$pkgrel" - lua - pipewire - ) - optdepends=('wireplumber-docs: Documentation') - provides=(pipewire-session-manager) - conflicts=(pipewire-media-session) - - meson install -C build --destdir "$pkgdir" - - ( - cd "$pkgdir" - - _pick libw usr/lib/libwireplumber-$_ver.so* - _pick libw usr/lib/girepository-1.0 - _pick libw usr/lib/pkgconfig - _pick libw usr/include - _pick libw usr/share/gir-1.0 - ) - - install -Dt "$pkgdir/usr/share/doc/$pkgname" -m644 $pkgbase/{NEWS,README}* - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE + depends=( + "libwireplumber=$pkgver-$pkgrel" + lua + pipewire + ) + provides=(pipewire-session-manager) + conflicts=(pipewire-media-session) + + meson install -C build --destdir "$pkgdir" + + ( + cd "$pkgdir" + + _pick libw usr/lib/libwireplumber-$_ver.so* + _pick libw usr/lib/girepository-1.0 + _pick libw usr/lib/pkgconfig + _pick libw usr/include + _pick libw usr/share/gir-1.0 + ) + + install -Dt "$pkgdir/usr/share/doc/$pkgname" -m644 $pkgbase/{NEWS,README}* + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE } package_libwireplumber() { - pkgdesc+=" - client library" - depends=( - libg{lib,module,object,io}-2.0.so - libpipewire-0.3.so - ) - provides=(libwireplumber-$_ver.so) + pkgdesc+=" - client library" + depends=( + libg{lib,module,object,io}-2.0.so + libpipewire-0.3.so + ) + provides=(libwireplumber-$_ver.so) - mv libw/* "$pkgdir" + mv libw/* "$pkgdir" - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE } # vim:set sw=2 sts=-1 et: From 9f7ce751eb2b9e62682397688be0e028084f6448 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jan 23 2024 22:52:01 +0000 Subject: [PATCH 72/73] freecad: add missing 'branding.xml' --- diff --git a/libre/freecad/branding.xml b/libre/freecad/branding.xml new file mode 100644 index 0000000..cfcd28f --- /dev/null +++ b/libre/freecad/branding.xml @@ -0,0 +1,4 @@ + + + PartDesignWorkbench + From c8cc44464d6196e5becc486f63c17a1cdd001806 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Jan 26 2024 20:56:01 +0000 Subject: [PATCH 73/73] libre/iceweasel: 122.0, sync with upstream changes --- diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch index 31f4a5b..e81f2d5 100644 --- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch +++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch @@ -1,4 +1,4 @@ -From 2699eccd5dc65f94d65738cec193e28e71f6321e Mon Sep 17 00:00:00 2001 +From 924f9c99de6f3223a46e472339c59726e60e5c79 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:20:39 +0200 Subject: [PATCH 01/13] Point to local omni.ja files, not remote server @@ -22,21 +22,48 @@ If necessary, missing files can be added later. [1] https://remote-settings.readthedocs.io/en/latest/introduction.html [2] https://www.gnu.org/distros/free-system-distribution-guidelines.en.html#license-rules --- - browser/components/newtab/bin/import-rollouts.js | 4 ++-- .../components/ASRouterAdmin/ASRouterAdmin.jsx | 2 +- - .../newtab/data/content/activity-stream.bundle.js | 2 +- + .../components/asrouter/content/asrouter-admin.bundle.js | 2 +- + browser/components/newtab/bin/import-rollouts.js | 4 ++-- services/settings/Utils.sys.mjs | 2 +- services/settings/docs/index.rst | 4 ++-- .../periodic-updates/scripts/periodic_file_updates.sh | 2 +- + third_party/rust/remote_settings/.cargo-checksum.json | 2 +- + third_party/rust/remote_settings/src/client.rs | 4 ++-- .../components/antitracking/docs/query-stripping/index.md | 2 +- .../backgroundtasks/BackgroundTask_message.sys.mjs | 4 ++-- toolkit/components/search/SearchUtils.sys.mjs | 8 ++++---- toolkit/components/search/docs/DefaultSearchEngines.rst | 2 +- .../components/search/docs/SearchEngineConfiguration.rst | 2 +- toolkit/modules/AppConstants.sys.mjs | 4 ++-- - toolkit/mozapps/defaultagent/RemoteSettings.cpp | 2 +- - 13 files changed, 20 insertions(+), 20 deletions(-) + 14 files changed, 22 insertions(+), 22 deletions(-) +diff --git a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx +index 7d4484dc83..9346d518e6 100644 +--- a/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx ++++ b/browser/components/asrouter/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx +@@ -874,7 +874,7 @@ export class ASRouterAdminInner extends React.PureComponent { + + nimbus-desktop-experiments +diff --git a/browser/components/asrouter/content/asrouter-admin.bundle.js b/browser/components/asrouter/content/asrouter-admin.bundle.js +index 614e8a62a1..3ce250c6ed 100644 +--- a/browser/components/asrouter/content/asrouter-admin.bundle.js ++++ b/browser/components/asrouter/content/asrouter-admin.bundle.js +@@ -1641,7 +1641,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P + label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("a", { + className: "providerUrl", + target: "_blank", +- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", ++ href: "resource://app/defaults/settings/main/nimbus-desktop-experiments.json", + rel: "noopener noreferrer" + }, "nimbus-desktop-experiments"), ")"); + } diff --git a/browser/components/newtab/bin/import-rollouts.js b/browser/components/newtab/bin/import-rollouts.js index ce22d4a114..b2dc35e9d9 100644 --- a/browser/components/newtab/bin/import-rollouts.js @@ -59,34 +86,8 @@ index ce22d4a114..b2dc35e9d9 100644 console.log(`Fetching records from ${chalk.underline.yellow(RECORDS_URL)}`); -diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -index 3762be9c99..1a9c5028ff 100644 ---- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -+++ b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -@@ -1255,7 +1255,7 @@ export class ASRouterAdminInner extends React.PureComponent { - - nimbus-desktop-experiments -diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js -index 88a06b5702..a807face6a 100644 ---- a/browser/components/newtab/data/content/activity-stream.bundle.js -+++ b/browser/components/newtab/data/content/activity-stream.bundle.js -@@ -1787,7 +1787,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { - label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { - className: "providerUrl", - target: "_blank", -- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", -+ href: "resource://app/defaults/settings/main/nimbus-desktop-experiments.json", - rel: "noopener noreferrer" - }, "nimbus-desktop-experiments"), ")"); - } diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index c2db005b68..91aa355a87 100644 +index 73c83e526b..653cabe7e1 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs @@ -100,7 +100,7 @@ export var Utils = { @@ -117,7 +118,7 @@ index 3e042f67e4..dc8584c318 100644 #. Add the filename to the ``FINAL_TARGET_FILES`` list in ``services/settings/dumps/main/moz.build`` #. Add the filename to the ``[browser]`` section of ``mobile/android/installer/package-manifest.in`` IF the file should be bundled with Android. diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh -index b88ee476da..440615e4e1 100755 +index 160b7fbc35..2e9dcde464 100755 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh @@ -286,7 +286,7 @@ function compare_suffix_lists { @@ -129,6 +130,36 @@ index b88ee476da..440615e4e1 100755 # 1. List remote settings collections from server. echo "INFO: fetch remote settings list from server" +diff --git a/third_party/rust/remote_settings/.cargo-checksum.json b/third_party/rust/remote_settings/.cargo-checksum.json +index 28ac46a2c2..e8a54e1bac 100644 +--- a/third_party/rust/remote_settings/.cargo-checksum.json ++++ b/third_party/rust/remote_settings/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"cf0a08d6b0d6285a459b78115aa24818a04b5987652655e64b80ffd8c8ae0813","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"3d87162e6913a81cc6f5178a7ca791e262d0d029e7dedf3df4fe2f66e5501185","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} +\ No newline at end of file ++{"files":{"Cargo.toml":"cf0a08d6b0d6285a459b78115aa24818a04b5987652655e64b80ffd8c8ae0813","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"ff1ab5961fe695989d1ff343c5042ce0f907dc323da2ba87005fc9437919b448","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} +diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs +index 9585a7cc7c..1c97208b82 100644 +--- a/third_party/rust/remote_settings/src/client.rs ++++ b/third_party/rust/remote_settings/src/client.rs +@@ -33,7 +33,7 @@ impl Client { + pub fn new(config: RemoteSettingsConfig) -> Result { + let server_url = config + .server_url +- .unwrap_or_else(|| String::from("https://firefox.settings.services.mozilla.com")); ++ .unwrap_or_else(|| String::from("resource://app/defaults/settings")); + let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main")); + let base_url = Url::parse(&server_url)?; + +@@ -518,7 +518,7 @@ mod test { + }; + let client = Client::new(config).unwrap(); + assert_eq!( +- Url::parse("https://firefox.settings.services.mozilla.com").unwrap(), ++ Url::parse("resource://app/defaults/settings").unwrap(), + client.base_url + ); + assert_eq!(String::from("main"), client.bucket_name); diff --git a/toolkit/components/antitracking/docs/query-stripping/index.md b/toolkit/components/antitracking/docs/query-stripping/index.md index e49d8513ba..c1c6ae5deb 100644 --- a/toolkit/components/antitracking/docs/query-stripping/index.md @@ -158,10 +189,10 @@ index bb9d71b5c0..ec0c5f11d7 100644 // --preview: enable Remote Settings and Experiment previews. // diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs -index 0e86068dd4..964475174e 100644 +index 8e474b58a2..a8cd3cccac 100644 --- a/toolkit/components/search/SearchUtils.sys.mjs +++ b/toolkit/components/search/SearchUtils.sys.mjs -@@ -152,13 +152,13 @@ export var SearchUtils = { +@@ -193,13 +193,13 @@ export var SearchUtils = { ENGINES_URLS: { "prod-main": @@ -201,10 +232,10 @@ index c782f9f7c3..4d773d27c5 100644 +.. _viewed live: resource://app/defaults/settings/main/search-config.json .. _Normandy: /toolkit/components/normandy/normandy/services.html diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs -index b430666f68..0f640980ae 100644 +index 36b26056ec..ba54202045 100644 --- a/toolkit/modules/AppConstants.sys.mjs +++ b/toolkit/modules/AppConstants.sys.mjs -@@ -409,9 +409,9 @@ export var AppConstants = Object.freeze({ +@@ -416,9 +416,9 @@ export var AppConstants = Object.freeze({ REMOTE_SETTINGS_SERVER_URL: #ifdef MOZ_THUNDERBIRD @@ -216,41 +247,11 @@ index b430666f68..0f640980ae 100644 #endif REMOTE_SETTINGS_VERIFY_SIGNATURE: -diff --git a/third_party/rust/remote_settings/.cargo-checksum.json b/third_party/rust/remote_settings/.cargo-checksum.json -index 8794c625fe..d2752e72ef 100644 ---- a/third_party/rust/remote_settings/.cargo-checksum.json -+++ b/third_party/rust/remote_settings/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.toml":"c74e3df90cd82fb4ee00dd38d7e39cd7a0142ad601b8b63ae214978a28fbe1ac","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"3d87162e6913a81cc6f5178a7ca791e262d0d029e7dedf3df4fe2f66e5501185","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} -\ No newline at end of file -+{"files":{"Cargo.toml":"c74e3df90cd82fb4ee00dd38d7e39cd7a0142ad601b8b63ae214978a28fbe1ac","build.rs":"4326f03729cf8f1673e4228e6dc111de1ea4d8bcc06351f7ae563efb2613f866","src/client.rs":"ff1ab5961fe695989d1ff343c5042ce0f907dc323da2ba87005fc9437919b448","src/config.rs":"7bb678addfae3b4ed5f2892d32263e5b33cc05e5a12a250f664150e78211f94a","src/error.rs":"192ca42af7c6b882f3129378c23b45dab8a0d2b179e23a8813a335ffd56b21dc","src/lib.rs":"416e99894e152f6cea7418ad2fabfd94bc3d907efd9f33fbd2a83fb99452b2df","src/remote_settings.udl":"e38758592ca75adbebb8fe688b10520d9931a5f3292d94f229cba05310756a43","uniffi.toml":"f8ec8dc593e0d501c2e9e40368ec93ec33b1edd8608e29495e0a54b63144e880"},"package":null} -diff --git a/third_party/rust/remote_settings/src/client.rs b/third_party/rust/remote_settings/src/client.rs -index 9585a7cc7c..1c97208b82 100644 ---- a/third_party/rust/remote_settings/src/client.rs -+++ b/third_party/rust/remote_settings/src/client.rs -@@ -33,7 +33,7 @@ impl Client { - pub fn new(config: RemoteSettingsConfig) -> Result { - let server_url = config - .server_url -- .unwrap_or_else(|| String::from("https://firefox.settings.services.mozilla.com")); -+ .unwrap_or_else(|| String::from("resource://app/defaults/settings")); - let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main")); - let base_url = Url::parse(&server_url)?; - -@@ -518,7 +518,7 @@ mod test { - }; - let client = Client::new(config).unwrap(); - assert_eq!( -- Url::parse("https://firefox.settings.services.mozilla.com").unwrap(), -+ Url::parse("resource://app/defaults/settings").unwrap(), - client.base_url - ); - assert_eq!(String::from("main"), client.bucket_name); -- -2.42.0 +2.43.0 -From d954757081cd70d27e0dc8d5adca68d95c97cb57 Mon Sep 17 00:00:00 2001 +From 3536b16aa46bda48ac8692ca72e978837fcef796 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:34:08 +0200 Subject: [PATCH 02/13] Remove polling triggered by push broadcasts @@ -291,10 +292,10 @@ index eea31ef192..529ecd6917 100644 * Call the listeners of the specified broadcasts. * diff --git a/services/settings/remote-settings.sys.mjs b/services/settings/remote-settings.sys.mjs -index 95896f5f6e..01111aa690 100644 +index b93da0f0e4..8d59bc6b05 100644 --- a/services/settings/remote-settings.sys.mjs +++ b/services/settings/remote-settings.sys.mjs -@@ -572,11 +572,7 @@ function remoteSettingsFunction() { +@@ -575,11 +575,7 @@ function remoteSettingsFunction() { moduleURI: import.meta.url, symbolName: "remoteSettingsBroadcastHandler", }; @@ -307,7 +308,7 @@ index 95896f5f6e..01111aa690 100644 }; return remoteSettings; -@@ -596,9 +592,6 @@ export var remoteSettingsBroadcastHandler = { +@@ -599,9 +595,6 @@ export var remoteSettingsBroadcastHandler = { `Push notification received (version=${version} phase=${phase})` ); @@ -319,10 +320,10 @@ index 95896f5f6e..01111aa690 100644 }, }; -- -2.42.0 +2.43.0 -From 01820751018f1b849884204d081816e7d4bcb9df Mon Sep 17 00:00:00 2001 +From 528c5d6d9437c003b731b3531273dbeb10422a0c Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:41:54 +0200 Subject: [PATCH 03/13] Remove timer that triggers polling for changes @@ -363,10 +364,10 @@ index 3bfed26ea4..807eb220ec 100644 -# see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155 -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 -- -2.42.0 +2.43.0 -From 400c2e04fa34d920e294c00235838083a0bf6bd4 Mon Sep 17 00:00:00 2001 +From d13036fd21af770da7d305d058ecedd560afba2f Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:47:41 +0200 Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally @@ -385,10 +386,10 @@ code that expects them. create mode 100644 services/settings/dumps/monitor/moz.build diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index 5296d2b4b1..6d8aa0e0b1 100644 +index b3213b8c44..0f953c3425 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -260,6 +260,7 @@ +@@ -258,6 +258,7 @@ @RESPATH@/browser/defaults/settings/last_modified.json @RESPATH@/browser/defaults/settings/blocklists @RESPATH@/browser/defaults/settings/main @@ -397,10 +398,10 @@ index 5296d2b4b1..6d8aa0e0b1 100644 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index 91aa355a87..c9e11531d4 100644 +index 653cabe7e1..e4d4247253 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs -@@ -369,7 +369,7 @@ export var Utils = { +@@ -376,7 +376,7 @@ export var Utils = { async fetchLatestChanges(serverUrl, options = {}) { const { expectedTimestamp, lastEtag = "", filters = {} } = options; @@ -409,7 +410,7 @@ index 91aa355a87..c9e11531d4 100644 const params = { ...filters, _expected: expectedTimestamp ?? 0, -@@ -384,7 +384,21 @@ export var Utils = { +@@ -391,7 +391,21 @@ export var Utils = { .map(([k, v]) => `${k}=${encodeURIComponent(v)}`) .join("&"); } @@ -432,7 +433,7 @@ index 91aa355a87..c9e11531d4 100644 if (response.status >= 500) { throw new Error(`Server error ${response.status} ${response.statusText}`); -@@ -419,7 +433,15 @@ export var Utils = { +@@ -426,7 +440,15 @@ export var Utils = { } } @@ -476,10 +477,10 @@ index f407580bfa..53e9d8b45e 100644 ] -- -2.42.0 +2.43.0 -From 906c6cdabc913a605cf91889503072cfaa7b9085 Mon Sep 17 00:00:00 2001 +From b2a061b8b79988eeef189af214fa03e4d7c76153 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:52:10 +0200 Subject: [PATCH 05/13] Utils: disable offline checking @@ -491,10 +492,10 @@ current and any future code that relies on it. 1 file changed, 10 deletions(-) diff --git a/services/settings/Utils.sys.mjs b/services/settings/Utils.sys.mjs -index c9e11531d4..092c94376f 100644 +index e4d4247253..296001536c 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs -@@ -183,16 +183,6 @@ export var Utils = { +@@ -190,16 +190,6 @@ export var Utils = { * @return {bool} Whether network is down or not. */ get isOffline() { @@ -512,10 +513,10 @@ index c9e11531d4..092c94376f 100644 }, -- -2.42.0 +2.43.0 -From 6e4aa6ad6c0579e96e7a3eb8d3c6d9de1d8fc898 Mon Sep 17 00:00:00 2001 +From 96d145c3ca83e835c4ec6711e75c01627e509ea0 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:56:02 +0200 Subject: [PATCH 06/13] Refactor hashing logic to a separate function @@ -566,10 +567,10 @@ index 1eeaf0bed9..d998a2d3b1 100644 /** -- -2.42.0 +2.43.0 -From ae2173787a6e4690ec4f63a367210753b3ea47be Mon Sep 17 00:00:00 2001 +From b612fe1de7381746ac51694a4110268d0769ca6c Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:05:02 +0200 Subject: [PATCH 07/13] Client: Fetch and hash records from local dump @@ -604,10 +605,10 @@ the upgrade to local-only setup. 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 17a693ad93..b0efbd2403 100644 +index 7e95b9baab..989a3180b8 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -702,11 +702,9 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -706,11 +706,9 @@ export class RemoteSettingsClient extends EventEmitter { // If the data is up-to-date but don't have metadata (records loaded from dump), // we fetch them and validate the signature immediately. @@ -621,7 +622,7 @@ index 17a693ad93..b0efbd2403 100644 await this.db.importChanges(metadata); // We don't bother validating the signature if the dump was just loaded. We do // if the dump was loaded at some other point (eg. from .get()). -@@ -983,38 +981,28 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -987,38 +985,28 @@ export class RemoteSettingsClient extends EventEmitter { * @returns {Promise} */ async _validateCollectionSignature(records, timestamp, metadata) { @@ -668,7 +669,7 @@ index 17a693ad93..b0efbd2403 100644 } } -@@ -1181,24 +1169,26 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1185,24 +1173,26 @@ export class RemoteSettingsClient extends EventEmitter { * @param since timestamp of last sync (optional) */ async _fetchChangeset(expectedTimestamp, since) { @@ -712,10 +713,10 @@ index 17a693ad93..b0efbd2403 100644 remoteRecords, }; -- -2.42.0 +2.43.0 -From 4b80ad7284b8b2397afcc0c33de070e0c9abf223 Mon Sep 17 00:00:00 2001 +From 9eaa21162fc1e2abeb24381edd4bea01fd103065 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:42:56 +0200 Subject: [PATCH 08/13] Client: start deferred sync on get() or on() @@ -737,7 +738,7 @@ occurs during the session. 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index b0efbd2403..232fd5ddbf 100644 +index 989a3180b8..c2c2a5734b 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs @@ -12,6 +12,7 @@ ChromeUtils.defineESModuleGetters(lazy, { @@ -817,10 +818,10 @@ index b0efbd2403..232fd5ddbf 100644 * Synchronize the local database with the remote server. * -- -2.42.0 +2.43.0 -From 4947e8705cdde1b78e223f2713edb435233d03b7 Mon Sep 17 00:00:00 2001 +From 4598808209c3a9a8cd3902053b250c88861bced2 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:53:51 +0200 Subject: [PATCH 09/13] Client: deep compare records if timestamps match @@ -842,7 +843,7 @@ noticeable performance issues. 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 232fd5ddbf..64fda00c7f 100644 +index c2c2a5734b..ee612a049c 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs @@ -9,6 +9,7 @@ import { Downloader } from "resource://services-settings/Attachments.sys.mjs"; @@ -853,7 +854,7 @@ index 232fd5ddbf..64fda00c7f 100644 ClientEnvironmentBase: "resource://gre/modules/components-utils/ClientEnvironment.sys.mjs", Database: "resource://services-settings/Database.sys.mjs", -@@ -1169,7 +1170,10 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1173,7 +1174,10 @@ export class RemoteSettingsClient extends EventEmitter { const old = oldById.get(r.id); if (old) { oldById.delete(r.id); @@ -866,10 +867,10 @@ index 232fd5ddbf..64fda00c7f 100644 } } else { -- -2.42.0 +2.43.0 -From 31e3597a5fc978ccbec4dda6ee51a129f8a41a1e Mon Sep 17 00:00:00 2001 +From 79445efeb9c18ad9c2e2c4070cdc72aa6b736d1e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:01:39 +0200 Subject: [PATCH 10/13] Client: delete more data on cleanup @@ -887,7 +888,7 @@ logic gets the data about the attachments from those records. 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 64fda00c7f..396f1c3eac 100644 +index ee612a049c..b3c6caebba 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs @@ -255,7 +255,7 @@ class AttachmentDownloader extends Downloader { @@ -899,7 +900,7 @@ index 64fda00c7f..396f1c3eac 100644 ) ); } -@@ -1129,7 +1129,7 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1133,7 +1133,7 @@ export class RemoteSettingsClient extends EventEmitter { // Signature failed, clear local DB because it contains // bad data (local + remote changes). lazy.console.debug(`${this.identifier} clear local data`); @@ -908,7 +909,7 @@ index 64fda00c7f..396f1c3eac 100644 // Local data was tampered, throw and it will retry from empty DB. lazy.console.error(`${this.identifier} local data was corrupted`); throw new CorruptedDataError(this.identifier); -@@ -1151,7 +1151,7 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1155,7 +1155,7 @@ export class RemoteSettingsClient extends EventEmitter { // _importJSONDump() only clears DB if dump is available, // therefore do it here! if (imported < 0) { @@ -917,7 +918,7 @@ index 64fda00c7f..396f1c3eac 100644 } } } -@@ -1191,6 +1191,12 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1195,6 +1195,12 @@ export class RemoteSettingsClient extends EventEmitter { return syncResult; } @@ -931,10 +932,10 @@ index 64fda00c7f..396f1c3eac 100644 * Fetch information from changeset endpoint. * -- -2.42.0 +2.43.0 -From 0e73e5552e2c9b4189a1bb19ce086420e5f54336 Mon Sep 17 00:00:00 2001 +From 24ba3c8ca82381eba887a318fb09f6d24e07064c Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:07:56 +0200 Subject: [PATCH 11/13] Client: remove comparison of collection timestamps @@ -949,10 +950,10 @@ necessary cleanup. So remove the checks. 1 file changed, 5 deletions(-) diff --git a/services/settings/RemoteSettingsClient.sys.mjs b/services/settings/RemoteSettingsClient.sys.mjs -index 396f1c3eac..60be4b0372 100644 +index b3c6caebba..264a6cc831 100644 --- a/services/settings/RemoteSettingsClient.sys.mjs +++ b/services/settings/RemoteSettingsClient.sys.mjs -@@ -1071,14 +1071,9 @@ export class RemoteSettingsClient extends EventEmitter { +@@ -1075,14 +1075,9 @@ export class RemoteSettingsClient extends EventEmitter { updated: [], deleted: [], }; @@ -968,10 +969,10 @@ index 396f1c3eac..60be4b0372 100644 await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { clear: retry, -- -2.42.0 +2.43.0 -From 1423f0168d322121a302b227be9ae64fd9f0adea Mon Sep 17 00:00:00 2001 +From 633d8d40e00786b388e62898e32414d1305fa91f Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:15:44 +0200 Subject: [PATCH 12/13] Attachments: load only from dump and drop cached @@ -1060,10 +1061,10 @@ index 5ddc6bb046..f7888cb769 100644 /** -- -2.42.0 +2.43.0 -From 961ada13d31f49efbc1e8b56aa8a8811ca61408a Mon Sep 17 00:00:00 2001 +From c0b96623a42ed3c74218fcc2574f78196fd901ff Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:22:20 +0200 Subject: [PATCH 13/13] Disable CRLite entirely for now @@ -1088,10 +1089,10 @@ certificate revocations. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index c7ca7ae249..f5d7c4e320 100644 +index 592ddd3229..9688ee64fd 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -13980,7 +13980,7 @@ +@@ -14167,7 +14167,7 @@ # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". - name: security.pki.crlite_mode type: RelaxedAtomicUint32 @@ -1101,7 +1102,7 @@ index c7ca7ae249..f5d7c4e320 100644 - name: security.tls.version.min diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp -index 3893cdcdf2..adf85992a4 100644 +index dd14b5c24c..90350be691 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp @@ -1129,6 +1129,7 @@ void nsNSSComponent::setValidationOptions( @@ -1113,4 +1114,5 @@ index 3893cdcdf2..adf85992a4 100644 case CRLiteMode::Disabled: case CRLiteMode::TelemetryOnly: -- -2.42.0 +2.43.0 + diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch index 770b1f8..667c55e 100644 --- a/libre/iceweasel/9002-FSDG-preference-defaults.patch +++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch @@ -339,9 +339,9 @@ index f58075204d..a2ffbec390 100644 // engine https://browser.mt/. -pref("browser.translations.enable", true); +pref("browser.translations.enable", false); - - // Telemetry settings. - // Determines if Telemetry pings can be archived locally. + + // Enable the new Firefox Translations Settings UI Design + pref("browser.translations.newSettingsUI.enable", false); -- 2.42.0 diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index dbbf484..ea06170 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -1159,16 +1159,13 @@ index 7d37d26..4ebbc06 100644 diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl -index e446a1e651..b6c9e4adc6 100644 +index 504598d05e..075f9f60cb 100644 --- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl +++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl -@@ -15,18 +15,18 @@ +@@ -15,16 +15,16 @@ ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark -facebook-container-brand-name = Facebook Container ---lockwise-brand-name = Firefox Lockwise -+-lockwise-brand-name = Iceweasel Lockwise - -lockwise-brand-short-name = Lockwise --monitor-brand-name = Firefox Monitor +-monitor-brand-name = Iceweasel Monitor -monitor-brand-short-name = Monitor @@ -1189,7 +1186,7 @@ index e446a1e651..b6c9e4adc6 100644 -relay-brand-short-name = Relay -fakespot-brand-name = Fakespot -@@ -36,14 +36,14 @@ +@@ -34,14 +34,14 @@ # The particle "by" can be localized, "Fakespot" and "Mozilla" should not be localized or transliterated. -fakespot-brand-full-name = Fakespot by Mozilla @@ -1197,19 +1194,19 @@ index e446a1e651..b6c9e4adc6 100644 +# “Suggest” can be localized, “Iceweasel” must be treated as a brand # and kept in English. --firefox-suggest-brand-name = Firefox Suggest -+-firefox-suggest-brand-name = Iceweasel Suggest ++-Iceweasel-suggest-brand-name = Iceweasel Suggest -# ”Home" can be localized, “Firefox” must be treated as a brand +# ”Home" can be localized, “Iceweasel” must be treated as a brand # and kept in English. --firefox-home-brand-name = Firefox Home -+-firefox-home-brand-name = Iceweasel Home ++-Iceweasel-home-brand-name = Iceweasel Home -# View" can be localized, “Firefox” must be treated as a brand +# View" can be localized, “Iceweasel” must be treated as a brand # and kept in English. --firefoxview-brand-name = Firefox View -+-firefoxview-brand-name = Iceweasel View ++-Iceweaselview-brand-name = Iceweasel View diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl index 829c18c5e1..71c75114e9 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index ea1782b..fe12ca2 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,7 +70,7 @@ pkgname=iceweasel epoch=1 -pkgver=121.0.1 +pkgver=122.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=120.0 @@ -99,7 +99,6 @@ makedepends=( cbindgen clang diffutils - dump_syms imake inetutils jack @@ -142,11 +141,9 @@ optdepends=( # provides=('firefox') # TODO: redmine #2164 - currently conflicts with 'your-freedom' replaces=('firefox') options=( - !debug !emptydirs !lto !makeflags - !strip ) source=( https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} @@ -180,34 +177,34 @@ validpgpkeys+=( '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger ) -sha256sums=('b3a4216e01eaeb9a7c6ef4659d8dcd956fbd90a78a8279ee3a598881e63e49ce' +sha256sums=('b84815a90e147965e4c0b50599c85b1022ab0fce42105e5ef45c630dcca5dec3' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') # $pkgname.desktop # identity-icons-brand.svg sha256sums+=('a5eed3c1f31a253f90b0284e0caf17bd35b3fa35197cfc403cb1bd987ecd56eb' # *.branding.tar.xz 'SKIP' - '4ff07eff69343e50357c9bb571dfa6a702efb3a7915ce8ca8dcb42ee18446aac' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - '3e3c5c0a9751e4728a7c7f009a1eb90565de4ebe1b938b74b6669b28168bf335' # 9002-FSDG-preference-defaults.patch - '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62' # 9003-FSDG-urihandlers.patch - 'f999ddb5a2cde87217bb5b0ebf20b4e0aabe88657a73545c9487cddde1deab22' # 9004-FSDG-misc.patch - '5f3a646d90a075458b4cb27c19ddbd50ae7717f4e3371c9e2e4de1a8e718553e' # process-json-files.py + 'b6b100d7749387362bda9c8c8c19fe742870ec8a7a39172878b8dbfe773efeee' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '8f530e41f19675bd74e62f5182f7975a24b690d5d17420fbe8a5365d55b71910' # 9002-FSDG-preference-defaults.patch + '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62' # 9003-FSDG-urihandlers.patch + '6d1b95deba71e6e0569fe4aff460ca1c0734c9f3a56b6c56809b7414a82189e5' # 9004-FSDG-misc.patch + 'c1d57c2b5b3621b34a4c5e7cc6e83170cfa576965b341c71e750e610440f490c' # process-json-files.py '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06') # vendor.js.in sha256sums_i686=('62fa060e09b95e92fa81f4ac47c06b03d70c2bbc6cda061d85e965a82730e1c0' # avoid-libxul-OOM-python-check.patch 'b25d9fb901afc5447bcd87416741f705eb7188502e10097387d5b0c86417fd01' # rust-static-disable-network-test-on-static-libraries.patch 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1' # firefox-111.0.1-fdlibm.patch '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06' # fix-i686-build-moz-1792159.patch 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch -b2sums=('c9931d38bb9c612000409ed54b2fbb190cabcb714cd559152f2f645a8a3a82934874d31e40fc298dca765dac94e4e0927b125e14cee325484ba0f9b1ed2cdc55' +b2sums=('7252cd58fef9f5fcb504c8c9f885567109c05e6ec92157459cc384edc6935adb206e3be0b805aeaa37dbd72656c3243db1291b745dd0f705f37a61319a4dc820' 'SKIP' 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635') # $pkgname.desktop # identity-icons-brand.svg b2sums+=('d6ccdc46fce7cfc4bb35a6b09deee8cd96b9076c599c1f031b4d2c5a9c2722bdf98dd14eddde50422e9a1b88f24d425c8a5f1e861877a367c6ff5365e61258c0' # *.branding.tar.xz 'SKIP' - '9834f69d69f9ce3cee872a7e75b6848d5539b94752aa50c74612177a740319a33b02734f1d2cdde31ee50efa7a3ed85cf85efb7e6687cfe6ab7be843b4089e7b' # 9001-FSDG-sync-remote-settings-with-local-dump.patch - 'c11cb32b7959a47e6d52b45a1611d27c04129eefcb015f8f9b005c9b29a2ee216e4a4702386b159867ed121705768f0a1721e01f5cab03a5444cdf09a9ef053b' # 9002-FSDG-preference-defaults.patch - 'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch - '7d7c9a67ef8035f85482b37d0b7b7743f005d5e7f48d1865f21745ebd10053ed8a6c15e1e176f42d5ef738e7bb074bdad8e912983ca4614a2aab50b95824a4a6' # 9004-FSDG-misc.patch - '6224eb8db58c0d00353512d5bf420a16be90a86dc86c9a8d735026a7f77ca4a8a148fea38015fc9639254b9e02b17d01521ad6b233a890aa082fb8476992fa2f' # process-json-files.py + 'adb8c96328cbc6f8c7e50207b89c2d4c68733dd1fdcd341ae2ac4a3a1702430c2e5983e4249682153e0e593e0f54ab0258ed01d849589e8dc77c8729beccf3e7' # 9001-FSDG-sync-remote-settings-with-local-dump.patch + '97bc57322635a7fa5d55b087303ece6f982104db5ef945393e74722acd783262bcc63e5cd3e5748eae9f07a9add59925898b67a2e20fa8420d4c7bfc4cd39867' # 9002-FSDG-preference-defaults.patch + 'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde' # 9003-FSDG-urihandlers.patch + '043d0abcd81a3826104868c3885d4b102949616a787e7bf3f2bc502d46d9fdf9fb9c2ee6578e0907cb6083c985dda2dc2862b8e63504eda130d28eadd06489a8' # 9004-FSDG-misc.patch + '74e81a58faa219d6a822caae0212896561ecf8d97f736b9b23c6aec2b6e9dbd284702093ee1c75bd99638d8f86c4755542ae4b0dfa0ce8a25064e3430a6f2135' # process-json-files.py 'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9') # vendor.js.in b2sums_i686=('684559d207d33e8b83c70d79ddb8b4d7532f2440895668245856553e02b6c786cf0de776981cdcce2438c7add2d692f4afbc85255949558852bdec9800c59882' # avoid-libxul-OOM-python-check.patch '32c60a9259f9ab6b950c0a3af81e4c36c14160860d3b9da70aa3fbc3676e5fd2b2705b02d7e6b6ac49f9510577de89ab2334abe3b0a126e3d70e65ac42ba62c9' # rust-static-disable-network-test-on-static-libraries.patch @@ -421,6 +418,7 @@ ac_add_options --enable-hardening ac_add_options --enable-optimize ac_add_options --enable-rust-simd ac_add_options --enable-linker=lld +ac_add_options --disable-install-strip ac_add_options --disable-elf-hack ac_add_options --disable-bootstrap ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot @@ -713,7 +711,6 @@ build() { export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # parabola policy export MOZBUILD_STATE_PATH="$srcdir/mozbuild" export MOZ_BUILD_DATE="$(date -u${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH} +%Y%m%d%H%M%S)" - # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature export MOZ_NOSPAM=1 # malloc_usable_size is used in various parts of the codebase @@ -840,9 +837,6 @@ END (( ! _SKIP_PGO )) || echo "Building optimized browser..." ./mach build - - # echo "Building symbol archive..." # anti-feature - # ./mach buildsymbols # anti-feature } package() { @@ -907,7 +901,7 @@ END "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg" install -Dvm644 ../$pkgname.desktop \ - "$pkgdir/usr/share/applications/$pkgname.desktop" + "$pkgdir/usr/share/applications/${pkgname//-/}.desktop" # Install a wrapper to avoid confusion about binary path install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <