From 3e55a3c261b74f956329dec4834eae2a98b3c005 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Fri, 22 Jul 2022 21:24:46 -0400 Subject: sq - linux-libre-64 --- libre/linux-libre-64/PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libre/linux-libre-64/PKGBUILD b/libre/linux-libre-64/PKGBUILD index a75d06f1d..461b71fa9 100644 --- a/libre/linux-libre-64/PKGBUILD +++ b/libre/linux-libre-64/PKGBUILD @@ -6,10 +6,9 @@ # Contributor: Michał Masłowski # Contributor: Luke R. # Contributor: Andreas Grapentin -# Maintainers: Parabola hackers +# Maintainer: Parabola hackers # Based on linux package -# Based on linux-libre package, actually - megver83 will become maintainer eventually # WIP: This PKGBUILD is derived from the 'linux-libre' PKGBUILD, # and includes a lot of unused cruft, to minimize the diff. @@ -32,7 +31,9 @@ # should be identical to the linux-libre PKGBUILD. # In this way, the diff is minimal against the linux-libre PKGBUILD; # and it is obvious which parts are intended to become aarch64-specific, -# or exist only for cross-compiling the aarch64 kernel for armv7h systems. +# or exist only for cross-compiling the 64-bit foreign kernels for armv7h and i686. +# After that, this PKGBUILD could be cleaned up greatly, +# to focus only on the aarch64 kernel for armv7h, and the x86_64 kernel for i686. _replacesarchkernel=('linux%') # '%' gets replaced with kernel suffix -- cgit v1.2.3 From e1f1521e6272a22f2c094e4ddbfc218a9ca3bdcf Mon Sep 17 00:00:00 2001 From: bill-auger Date: Fri, 22 Jul 2022 22:28:59 -0400 Subject: [gophernicus]: move to [pcr] --- pcr-testing/gophernicus/PKGBUILD | 65 ---------------------- pcr-testing/gophernicus/fix-make-log-typo.patch | 13 ----- pcr-testing/gophernicus/gophernicus.install | 11 ---- .../gophernicus/preserve-existing-gophermap.patch | 15 ----- .../remove-DESTDIR-from-initscripts.patch | 32 ----------- .../xinetd-respect-custom-server-root.patch | 34 ----------- pcr/gophernicus/PKGBUILD | 65 ++++++++++++++++++++++ pcr/gophernicus/fix-make-log-typo.patch | 13 +++++ pcr/gophernicus/gophernicus.install | 11 ++++ pcr/gophernicus/preserve-existing-gophermap.patch | 15 +++++ .../remove-DESTDIR-from-initscripts.patch | 32 +++++++++++ .../xinetd-respect-custom-server-root.patch | 34 +++++++++++ 12 files changed, 170 insertions(+), 170 deletions(-) delete mode 100644 pcr-testing/gophernicus/PKGBUILD delete mode 100644 pcr-testing/gophernicus/fix-make-log-typo.patch delete mode 100644 pcr-testing/gophernicus/gophernicus.install delete mode 100644 pcr-testing/gophernicus/preserve-existing-gophermap.patch delete mode 100644 pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch delete mode 100644 pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch create mode 100644 pcr/gophernicus/PKGBUILD create mode 100644 pcr/gophernicus/fix-make-log-typo.patch create mode 100644 pcr/gophernicus/gophernicus.install create mode 100644 pcr/gophernicus/preserve-existing-gophermap.patch create mode 100644 pcr/gophernicus/remove-DESTDIR-from-initscripts.patch create mode 100644 pcr/gophernicus/xinetd-respect-custom-server-root.patch diff --git a/pcr-testing/gophernicus/PKGBUILD b/pcr-testing/gophernicus/PKGBUILD deleted file mode 100644 index d01c74125..000000000 --- a/pcr-testing/gophernicus/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# Maintainer: botplus -# Contributor: bill-auger - - -pkgname=gophernicus -pkgver=3.1.1 -pkgrel=2 -pkgdesc="Modern, full-featured (and hopefully) secure gopher daemon" -arch=('armv7h' 'i686' 'x86_64') -url="https://github.com/gophernicus/gophernicus" -license=('BSD2') - -backup=(etc/xinetd.d/gophernicus - srv/gopher/gophermap) -install=${pkgname}.install - -depends=('libwrap' 'xinetd') -optdepends=("xinetd-openrc: openrc init-script") -source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gophernicus/gophernicus/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz - xinetd-respect-custom-server-root.patch - remove-DESTDIR-from-initscripts.patch - fix-make-log-typo.patch - preserve-existing-gophermap.patch) - -b2sums=('74610071fab7ee6defc7e128c92f8775d00c42e6b3e806993d9468676e904388bd54cb101f25dad0e281e67090cfdcaf21728eab7821fa1cbd9ea09201d93acb' - 'da46d9010d3b7485aa092c3557c707473ac465451f7e09d32e52409bdefba0633900f198cb8aadc8a05e55274b70ef72cfc2bda4fe22b254c738aa078b0f8280' - '575bf3480b79c5381f2d08c029e96ebb7eee224e19effe294b95feb1f11f8536a53c12b4850df1263b609a776de350acb0cc17783547b841a631aa7643b3f468' - '56fedcb3d687b935a4d6d254f511b7fc9c2171190ec4eb00724fab82c93c424c2c373a8881818daba55bee9a381213b45c9a79fde13419a5f817a7bfd065f60c' - 'd6bc23c85168e235430eaf3c70edb62c2ee729c891aab15492b637d43fa752310a7f67cc9c194b3d174d46a6ce8a692bb685178874b8ea01086b12a4746f6fb4') - - -prepare() -{ - cd "${srcdir}"/${pkgname}-${pkgver} - - # allow server root under /srv/ with xinetd - patch -Np1 < "${srcdir}"/xinetd-respect-custom-server-root.patch - - # remove DESTDIR path from installed init scripts - patch -Np1 < "${srcdir}"/remove-DESTDIR-from-initscripts.patch - - # fix typo in make log (does not affect the binary package) - patch -Np1 < "${srcdir}"/fix-make-log-typo.patch - - # fix think-o in ./configure (does not affect the binary package) - patch -Np1 < "${srcdir}"/preserve-existing-gophermap.patch -} - -build() -{ - cd "${srcdir}"/${pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --listener=xinetd \ - --gopherroot=/srv/gopher - make -} - -package() -{ - cd "${srcdir}"/${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install -} diff --git a/pcr-testing/gophernicus/fix-make-log-typo.patch b/pcr-testing/gophernicus/fix-make-log-typo.patch deleted file mode 100644 index 4cf75dd40..000000000 --- a/pcr-testing/gophernicus/fix-make-log-typo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 3ab1bd1..5468d92 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -109,7 +109,7 @@ install-msg-xinetd: - echo "accessed." - echo "On systemd distributions:" - echo " systemctl restart xinetd" -- echo "You can configure arguments, including the hostname, in $(INETD)." -+ echo "You can configure arguments, including the hostname, in $(XINETD)." - echo - - install-msg-systemd: diff --git a/pcr-testing/gophernicus/gophernicus.install b/pcr-testing/gophernicus/gophernicus.install deleted file mode 100644 index ad4be4589..000000000 --- a/pcr-testing/gophernicus/gophernicus.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - echo "==> to start the gophernicus service:" - echo " systemd:" - echo " # systemctl start xinetd.service" - echo " openrc:" - echo " # rc-service xinetd start" - echo "==> configuration is:" - echo " /etc/xinetd.d/gophernicus" - echo "==> server root is:" - echo " /srv/gopher" -} diff --git a/pcr-testing/gophernicus/preserve-existing-gophermap.patch b/pcr-testing/gophernicus/preserve-existing-gophermap.patch deleted file mode 100644 index 544339113..000000000 --- a/pcr-testing/gophernicus/preserve-existing-gophermap.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure b/configure -index d54dc29..067affe 100755 ---- a/configure -+++ b/configure -@@ -280,9 +280,9 @@ printf "\\n" - # Don't replace an existing root - printf "checking for existing gopher root... " - if [ -d "${GOPHERROOT}" ] || [ -f "${GOPHERROOT}/gophermap" ]; then -- INSTALL_ROOT="install-root" - printf "yes" - else -+ INSTALL_ROOT="install-root" - printf "no" - fi - printf "\\n" diff --git a/pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch b/pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch deleted file mode 100644 index 96eec6d12..000000000 --- a/pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 5468d92..d047c7a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -145,15 +145,15 @@ install-root: - $(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap - - install-inetd-update: install-root -- update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" -+ update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" - update-inetd --enable gopher - - install-inetd-manual: install-root -- sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) -+ sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) - - install-xinetd: install-root - $(INSTALL) -d -m 755 $(DESTDIR)/etc/xinetd.d -- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd -+ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd - $(INSTALL) -m 644 -T init/$(NAME).xinetd $(DESTDIR)$(XINETD) - - install-osx: install-root -@@ -172,7 +172,7 @@ install-systemd: install-root - $(INSTALL) -m 644 -T init/$(NAME).env $(DESTDIR)$(DEFAULT)/$(NAME) - $(INSTALL) -d -m 755 $(DESTDIR)$(SYSTEMD) - $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME).socket -- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service -+ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service - $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME)\@.service - - uninstall: @UNINSTALL_INETD_UPDATE@ @UNINSTALL_INETD_MANUAL@ @UNINSTALL_XINETD@ @UNINSTALL_OSX@ @UNINSTALL_SYSTEMD@ diff --git a/pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch b/pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch deleted file mode 100644 index b0106639b..000000000 --- a/pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/configure b/configure -index 067affe..c78a9f6 100755 ---- a/configure -+++ b/configure -@@ -340,12 +340,14 @@ sed -i -e "s:@XINETD_CONF@:${XINETD_CONF}:" Makefile - - printf "done\\n" - --# Also sub in $HOSTNAME to the various init systems (whether or not we really --# use them, its just easier) -+# Also sub in $GOPHERROOT and $HOSTNAME to the various init systems -+# (whether or not we really use them, its just easier) - for f in gophernicus.env haiku_snippet org.gophernicus.server.plist \ - gophernicus.xinetd; do - printf "creating init/${f}... " -- sed -e "s:@HOSTNAME@:${HOSTNAME}:" "init/${f}.in" > "init/${f}" -+ cp init/${f}{.in,} -+ sed -i -e "s:@GOPHERROOT@:${GOPHERROOT}:" init/${f} -+ sed -i -e "s:@HOSTNAME@:${HOSTNAME}:" init/${f} - printf "done\\n" - done - -diff --git a/init/gophernicus.xinetd.in b/init/gophernicus.xinetd.in -index 4f2c921..a052375 100644 ---- a/init/gophernicus.xinetd.in -+++ b/init/gophernicus.xinetd.in -@@ -6,6 +6,6 @@ service gopher - wait = no - user = nobody - server = @BINARY@ -- server_args = -r/var/gopher -h@HOSTNAME@ -+ server_args = -r@GOPHERROOT@ -h@HOSTNAME@ - disable = no - } diff --git a/pcr/gophernicus/PKGBUILD b/pcr/gophernicus/PKGBUILD new file mode 100644 index 000000000..d01c74125 --- /dev/null +++ b/pcr/gophernicus/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: botplus +# Contributor: bill-auger + + +pkgname=gophernicus +pkgver=3.1.1 +pkgrel=2 +pkgdesc="Modern, full-featured (and hopefully) secure gopher daemon" +arch=('armv7h' 'i686' 'x86_64') +url="https://github.com/gophernicus/gophernicus" +license=('BSD2') + +backup=(etc/xinetd.d/gophernicus + srv/gopher/gophermap) +install=${pkgname}.install + +depends=('libwrap' 'xinetd') +optdepends=("xinetd-openrc: openrc init-script") +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gophernicus/gophernicus/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz + xinetd-respect-custom-server-root.patch + remove-DESTDIR-from-initscripts.patch + fix-make-log-typo.patch + preserve-existing-gophermap.patch) + +b2sums=('74610071fab7ee6defc7e128c92f8775d00c42e6b3e806993d9468676e904388bd54cb101f25dad0e281e67090cfdcaf21728eab7821fa1cbd9ea09201d93acb' + 'da46d9010d3b7485aa092c3557c707473ac465451f7e09d32e52409bdefba0633900f198cb8aadc8a05e55274b70ef72cfc2bda4fe22b254c738aa078b0f8280' + '575bf3480b79c5381f2d08c029e96ebb7eee224e19effe294b95feb1f11f8536a53c12b4850df1263b609a776de350acb0cc17783547b841a631aa7643b3f468' + '56fedcb3d687b935a4d6d254f511b7fc9c2171190ec4eb00724fab82c93c424c2c373a8881818daba55bee9a381213b45c9a79fde13419a5f817a7bfd065f60c' + 'd6bc23c85168e235430eaf3c70edb62c2ee729c891aab15492b637d43fa752310a7f67cc9c194b3d174d46a6ce8a692bb685178874b8ea01086b12a4746f6fb4') + + +prepare() +{ + cd "${srcdir}"/${pkgname}-${pkgver} + + # allow server root under /srv/ with xinetd + patch -Np1 < "${srcdir}"/xinetd-respect-custom-server-root.patch + + # remove DESTDIR path from installed init scripts + patch -Np1 < "${srcdir}"/remove-DESTDIR-from-initscripts.patch + + # fix typo in make log (does not affect the binary package) + patch -Np1 < "${srcdir}"/fix-make-log-typo.patch + + # fix think-o in ./configure (does not affect the binary package) + patch -Np1 < "${srcdir}"/preserve-existing-gophermap.patch +} + +build() +{ + cd "${srcdir}"/${pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --listener=xinetd \ + --gopherroot=/srv/gopher + make +} + +package() +{ + cd "${srcdir}"/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/gophernicus/fix-make-log-typo.patch b/pcr/gophernicus/fix-make-log-typo.patch new file mode 100644 index 000000000..4cf75dd40 --- /dev/null +++ b/pcr/gophernicus/fix-make-log-typo.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index 3ab1bd1..5468d92 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -109,7 +109,7 @@ install-msg-xinetd: + echo "accessed." + echo "On systemd distributions:" + echo " systemctl restart xinetd" +- echo "You can configure arguments, including the hostname, in $(INETD)." ++ echo "You can configure arguments, including the hostname, in $(XINETD)." + echo + + install-msg-systemd: diff --git a/pcr/gophernicus/gophernicus.install b/pcr/gophernicus/gophernicus.install new file mode 100644 index 000000000..ad4be4589 --- /dev/null +++ b/pcr/gophernicus/gophernicus.install @@ -0,0 +1,11 @@ +post_install() { + echo "==> to start the gophernicus service:" + echo " systemd:" + echo " # systemctl start xinetd.service" + echo " openrc:" + echo " # rc-service xinetd start" + echo "==> configuration is:" + echo " /etc/xinetd.d/gophernicus" + echo "==> server root is:" + echo " /srv/gopher" +} diff --git a/pcr/gophernicus/preserve-existing-gophermap.patch b/pcr/gophernicus/preserve-existing-gophermap.patch new file mode 100644 index 000000000..544339113 --- /dev/null +++ b/pcr/gophernicus/preserve-existing-gophermap.patch @@ -0,0 +1,15 @@ +diff --git a/configure b/configure +index d54dc29..067affe 100755 +--- a/configure ++++ b/configure +@@ -280,9 +280,9 @@ printf "\\n" + # Don't replace an existing root + printf "checking for existing gopher root... " + if [ -d "${GOPHERROOT}" ] || [ -f "${GOPHERROOT}/gophermap" ]; then +- INSTALL_ROOT="install-root" + printf "yes" + else ++ INSTALL_ROOT="install-root" + printf "no" + fi + printf "\\n" diff --git a/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch b/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch new file mode 100644 index 000000000..96eec6d12 --- /dev/null +++ b/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile.in b/Makefile.in +index 5468d92..d047c7a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -145,15 +145,15 @@ install-root: + $(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap + + install-inetd-update: install-root +- update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" ++ update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" + update-inetd --enable gopher + + install-inetd-manual: install-root +- sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) ++ sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) + + install-xinetd: install-root + $(INSTALL) -d -m 755 $(DESTDIR)/etc/xinetd.d +- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd ++ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd + $(INSTALL) -m 644 -T init/$(NAME).xinetd $(DESTDIR)$(XINETD) + + install-osx: install-root +@@ -172,7 +172,7 @@ install-systemd: install-root + $(INSTALL) -m 644 -T init/$(NAME).env $(DESTDIR)$(DEFAULT)/$(NAME) + $(INSTALL) -d -m 755 $(DESTDIR)$(SYSTEMD) + $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME).socket +- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service ++ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service + $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME)\@.service + + uninstall: @UNINSTALL_INETD_UPDATE@ @UNINSTALL_INETD_MANUAL@ @UNINSTALL_XINETD@ @UNINSTALL_OSX@ @UNINSTALL_SYSTEMD@ diff --git a/pcr/gophernicus/xinetd-respect-custom-server-root.patch b/pcr/gophernicus/xinetd-respect-custom-server-root.patch new file mode 100644 index 000000000..b0106639b --- /dev/null +++ b/pcr/gophernicus/xinetd-respect-custom-server-root.patch @@ -0,0 +1,34 @@ +diff --git a/configure b/configure +index 067affe..c78a9f6 100755 +--- a/configure ++++ b/configure +@@ -340,12 +340,14 @@ sed -i -e "s:@XINETD_CONF@:${XINETD_CONF}:" Makefile + + printf "done\\n" + +-# Also sub in $HOSTNAME to the various init systems (whether or not we really +-# use them, its just easier) ++# Also sub in $GOPHERROOT and $HOSTNAME to the various init systems ++# (whether or not we really use them, its just easier) + for f in gophernicus.env haiku_snippet org.gophernicus.server.plist \ + gophernicus.xinetd; do + printf "creating init/${f}... " +- sed -e "s:@HOSTNAME@:${HOSTNAME}:" "init/${f}.in" > "init/${f}" ++ cp init/${f}{.in,} ++ sed -i -e "s:@GOPHERROOT@:${GOPHERROOT}:" init/${f} ++ sed -i -e "s:@HOSTNAME@:${HOSTNAME}:" init/${f} + printf "done\\n" + done + +diff --git a/init/gophernicus.xinetd.in b/init/gophernicus.xinetd.in +index 4f2c921..a052375 100644 +--- a/init/gophernicus.xinetd.in ++++ b/init/gophernicus.xinetd.in +@@ -6,6 +6,6 @@ service gopher + wait = no + user = nobody + server = @BINARY@ +- server_args = -r/var/gopher -h@HOSTNAME@ ++ server_args = -r@GOPHERROOT@ -h@HOSTNAME@ + disable = no + } -- cgit v1.2.3 From 43762a8ab258defc08c991c6d355883befb14f8d Mon Sep 17 00:00:00 2001 From: bill-auger Date: Fri, 22 Jul 2022 22:48:54 -0400 Subject: sq - linux-libre-64 --- libre/linux-libre-64/PKGBUILD | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libre/linux-libre-64/PKGBUILD b/libre/linux-libre-64/PKGBUILD index 461b71fa9..20f495065 100644 --- a/libre/linux-libre-64/PKGBUILD +++ b/libre/linux-libre-64/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Michał Masłowski # Contributor: Luke R. # Contributor: Andreas Grapentin -# Maintainer: Parabola hackers +# Maintainer: Parabola Hackers # Based on linux package @@ -32,8 +32,7 @@ # In this way, the diff is minimal against the linux-libre PKGBUILD; # and it is obvious which parts are intended to become aarch64-specific, # or exist only for cross-compiling the 64-bit foreign kernels for armv7h and i686. -# After that, this PKGBUILD could be cleaned up greatly, -# to focus only on the aarch64 kernel for armv7h, and the x86_64 kernel for i686. +# After that, this PKGBUILD could be simplified, to focus only on the cross-compiled kernels. _replacesarchkernel=('linux%') # '%' gets replaced with kernel suffix @@ -63,10 +62,13 @@ 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} + # TODO: Move (in linux-libre) config.i686 config.armv7h, linux-armv7h.preset, + # and "kernel"{.its,.keyblock,_data_key.vbprivk} + # into their respective source_ arrays. + # Rename linux-armv7h.preset to linux-arm.preset, or add a new one for aarch64. 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 - # 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 @@ -80,6 +82,7 @@ source=( ) source_i686=( # avoid using zstd compression in ultra mode (exhausts virtual memory) + # Arch Linux 32 patches no-ultra-zstd.patch ) source_armv7h=( @@ -274,8 +277,8 @@ _package() { # The default arm64 image target is 'Image.gz' (per `make -s image_name`); # but some u-boot configs/versions don't support that, so we build 'Image' instead. # TODO: merge into 'linux-libre' PKGBUILD - [[ "$KARCH" == 'arm64' ]] && \ - install -Dm644 arch/$KARCH/boot/Image "$modulesdir/vmlinuz" || \ + [[ "$KARCH" == 'arm64' ]] && # cross-compile over-ride + install -Dm644 arch/$KARCH/boot/Image "$modulesdir/vmlinuz" || install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz" # FIXME: aarch64 - the kernel is not installed under /boot @@ -298,6 +301,9 @@ _package() { make ARCH=$KARCH CROSS_COMPILE=$CROSS_COMPILE INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install # cross-compile over-ride # armv7h presets only work with ALL_kver=$kernver + # TODO: kernel version auto-detection does not work for ARM kernels. + # it may be best to not use auto-detection at all, and use the same mechanism + # for all arches, eg: System.map or somthing simple like this below. backup=("etc/mkinitcpio.d/$pkgbase.preset") echo "Installing mkinitcpio preset..." sed "s|%PKGBASE%|$pkgbase|g;s|%KERNVER%|$kernver|g" ../linux-armv7h.preset \ @@ -346,7 +352,7 @@ _package-headers() { install -Dt "$builddir/arch/$KARCH/kernel" -m644 arch/$KARCH/kernel/asm-offsets.s # from linux-armv7 - [[ "$KARCH" != 'arm64' ]] && # aarch64 over-ride + [[ "$KARCH" != 'arm64' ]] && # cross-compile over-ride if [ "$CARCH" = "armv7h" ]; then for i in dove omap2; do mkdir -p "$builddir/arch/$KARCH/mach-$i" -- cgit v1.2.3 From e73290a7c64cecdac22b11bc2f48d71024e74f73 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Fri, 22 Jul 2022 23:55:53 -0400 Subject: sq - linux-libre-64 --- libre/linux-libre-64/PKGBUILD | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/libre/linux-libre-64/PKGBUILD b/libre/linux-libre-64/PKGBUILD index 20f495065..fc190ef36 100644 --- a/libre/linux-libre-64/PKGBUILD +++ b/libre/linux-libre-64/PKGBUILD @@ -1,4 +1,7 @@ # Contributor: David P. +# Maintainer (arch32): Erich Eckner +# Maintainer (arch32): Andreas Baumann +# Maintainer (archarm): Kevin Mihelich # Contributor: André Silva # Contributor: Márcio Silva # Contributor: fauno @@ -10,6 +13,55 @@ # Based on linux package +# Rationale: This package enables to run 64bit kernels with 32bit rootfs. +# +# For armv7k/aarch64, we have no aarch64 port yet, and the 32bit +# kernels don't work for 64bit computers (no 64bit DTB files, etc). +# +# In turn if we can boot Parabola on these computers, it enables +# people to work on an aarch64 port more easily as chrooting in 64bit +# rootfs from 32bit rootfs work when we have a 64bit kernel (tested on +# an x86_64 computer with a Parabola i686 rootfs and a Parabola x86_64 +# chroot). +# +# This enable to make rootfs that work on both 64bit and 32bit +# computers. In that case the user will still need to select the right +# kernel at boot. +# +# Generally speaking it also enable users to benefit from many of the +# improvements of 64bit kernels (ability to chroot in 64bit rootfs, +# better security, 4GiB address space per process instead of 3GiB for +# 32bit rootfs, etc) without having to reinstall everything. In +# addition, there was and is still no conversion guide to convert a +# 32bit Parabola installation to 64bit), and in some cases (lot of +# self-built software in /usr/local, PostgreSQL database, etc) the +# migration to 64bit requires some work. +# +# As for using i686 for new installation on x86_64 computers, it can +# enable people doing that to find and fix bugs on Parabola i686 to +# enable people with 32bit-only computers (like Libreboot compatible +# I945 Thinkpads) to still be able to use Parabola. +# +# Having both architectures (arm and x86) in the same PKGBUILD enables +# to more widely test this package (if we find issues on x86, they'll +# most likely apply to arm as well). Though it can become a problem if +# we need different kernel versions for both architectures. +# +# Status: +# - Tested on both arm and x86. +# - The build is currently broken on ARM due to a missing cross +# compiler for armv7h (it was accidentally removed and it doesn't +# build anymore). +# - External modules (like Wireguard or tp_smapi) also need to be +# cross compiled. So modules for linux-libre-64 need to be added +# (like tp_smapi-64) and dkms packages need to be adapted to also +# work for this kernel. +# - Some software (like building Guix) break with 32bit rootfs and +# 64bit kernels due to wrong assumption about the number of bits, +# through other software (like building rust with mrustc) work +# better (here because we have 3GiB instead of 3GiB of memory per +# process). Most software is not affected though. + # WIP: This PKGBUILD is derived from the 'linux-libre' PKGBUILD, # and includes a lot of unused cruft, to minimize the diff. # Eventually, these differences can be merged into linux-libre, @@ -157,6 +209,7 @@ case "$CARCH" in i686|x86_64) KARCH=x86;; armv7h) KARCH=arm;; esac +pkgdesc+=" 64-bit (${CROSS_COMPILE%%-*}) for Parabola ${CARCH}" # cross-compile over-ride export KBUILD_BUILD_HOST=parabola export KBUILD_BUILD_USER=$pkgbase -- cgit v1.2.3 From e1ee389f3b52b57e74f9fbe4ccbc1a8cbc9062ab Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sat, 23 Jul 2022 19:43:41 -0400 Subject: [libreboot-utils]: upgrade to v4.15.libreboot20220710 --- pcr/libreboot-utils/PKGBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pcr/libreboot-utils/PKGBUILD b/pcr/libreboot-utils/PKGBUILD index 9c9865fe0..ef97b05f0 100644 --- a/pcr/libreboot-utils/PKGBUILD +++ b/pcr/libreboot-utils/PKGBUILD @@ -4,23 +4,23 @@ # Maintainers: Parabola hackers pkgname=libreboot-utils -pkgrel=14 -_upstream_ver=20211122 +pkgrel=15 +_upstream_ver=20220710 pkgver=4.15.libreboot${_upstream_ver} pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)" url="https://libreboot.org/" arch=('x86_64' 'i686' 'armv7h') license=('GPL2') -makedepends=('pciutils' 'python' 'python-setuptools') +makedepends=('pciutils' 'python' 'python-setuptools' 'flex') _mirror="https://mirrors.mit.edu/libreboot" # use a mirror per libreboot's request -source=("${_mirror}/testing/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig} +source=("${_mirror}/stable/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig} "0001-cbfstool-enable-to-disable-Werror-in-standalone-buil.patch") -sha256sums=('e8a610e51e668c34627a6d9c048c554592fd2c2ab4dbcad83c85c06d132e5ad1' - '4442fc225383e1edf8f45e1aecba81868ae43db19978f15c17828389364c0434' +sha256sums=('92439034828aa66d52507c97d8260a7d0335abbeedb1a70e5e1466b92a903645' + 'e8afb35e6d9328baa5cee5325c60cb40467559596e93a7ae218883ece3484b8f' 'SKIP') -sha512sums=('3eac75b33bc6d2874c3ca1ad2392db7287992cf91d37879bb3244dbd6716bc7ffa3f8d31e15d821899e91a55b6fe665d918bea4e9da92e5e98345e9bcbe1bb95' - '3a532ecef550ef27b723845544e91ff6b13ed6f2f1188d40fdeb7b3c416be619ff58103c3b01cd52ff88c28df6d419d2113b92d0b8ba36d1a74cfc16f70e0e63' +sha512sums=('73fe77983d30997295747e365a363f6fc4897f469d9b24640fc6a7105f0ddb623890e797723077222212695dbbe9abb5186b04d75dad39f99cb62733f4b0de60' + 'aa4f35df0da8e93dda169034e906576db291ac2e6fe27b5c9693827ff99ecaa8c45b80892f0792505fb1d9c6d5190517a59309304f93c3e1f504ddacf95684c1' 'SKIP') validpgpkeys=('98CCDDF8E56047F475C044BDD0C62464FA8B4856') # Leah Rowe -- cgit v1.2.3 From 8dbae4268245cd9283ca810c0d8fcf778d50b385 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sat, 23 Jul 2022 19:44:21 -0400 Subject: [gmid]: upgrade to v1.8.4 --- pcr/gmid/PKGBUILD | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pcr/gmid/PKGBUILD b/pcr/gmid/PKGBUILD index 073881ea1..cd743cd3a 100644 --- a/pcr/gmid/PKGBUILD +++ b/pcr/gmid/PKGBUILD @@ -9,8 +9,8 @@ pkgname=gmid -pkgver=1.8.3 -pkgrel=3 +pkgver=1.8.4 +pkgrel=1 pkgdesc='Fast Gemini server written with security in mind.' arch=('x86_64') arch+=('i686' 'armv7h') @@ -30,26 +30,28 @@ source=( "gmid.conf" "index.gmi" ) -mksha256sums=('f7b6cc1deaea6c5242301fa7440c0f5caaf282fea780ba1edcef480f7fa67fe1') +mksha256sums=('abecdec3bfc2f2deac9d57b84e43334484fc537e5086a3c061f07f6311c89d2f') sha256sums=( - '5a7ad3ef93434b8a42f18bffe93444de9d30360e4c799dcadac844374e2046ca' + '0' 'SKIP' '946de0766343225068a0e3f38cb39a4a93ef312525dd775226b938cd08706b94' '4d943727a57dbf5f246963c0f90ccc54919cc2296538457e6b16f29f7580d9d6' +# '6f3814be535099857b579126e5fb5ff9a9a6520d4ea9116c8a0c6a8589ab9ef6' 'eddbe93741d01077426bc0239db42815c75a0da5191b4e6528df60ae3e0e5bb3' 'f396c7db961c45ddb8e48acf42708b3faf9df2a3eaa56f30d9e64d4de0971e88' '7acf491fee5f2693b30666b1f2c6eb0a4db33e9ef3154e1cbfb62186c6fa7be6' +# 'db240698dfb804d203299b3c89015a493c4fe97bec5cb3b3f920e566045191ce' +# 'fac76dfe3da74d9dce4ed3acbb6bd0023904140bd71219a7cac06236e2e93d29' '361cd4ef2b47437b0f5729d56d0ef88851e56812ab88546c82cda0092fe86139' ) validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger - mksource() { cd "$srcdir/$pkgname-$pkgver" - # Remove unlicensed files. - rm -r contrib - rm -r site + # Remove unlicensed files + rm -rf contrib + rm -rf site } build() { -- cgit v1.2.3 From 9df50f11ab51b064a541c423aaf573fa32b36973 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sat, 23 Jul 2022 19:49:34 -0400 Subject: normalize 'Maintrainers:->Maintainer: Parabola Hackers' across all PKGBUILDs --- libre/barebox-tools/PKGBUILD | 2 +- libre/java-assertj/PKGBUILD | 2 +- libre/linux-libre-vanilla/PKGBUILD | 2 +- libre/parabola-base/PKGBUILD | 2 +- libre/parabola-vmbootstrap/PKGBUILD | 2 +- libre/powerpc64le-linux-gnu-gcc-initial/PKGBUILD | 2 +- libre/pureos-archive-keyring/PKGBUILD | 2 +- libre/uboot4extlinux-imx/PKGBUILD | 2 +- libre/uboot4extlinux-sunxi/PKGBUILD | 5 ++--- libre/x86_64-pc-linux-gnu-binutils/PKGBUILD | 2 +- libre/x86_64-pc-linux-gnu-gcc/PKGBUILD | 2 +- pcr/libreboot-utils/PKGBUILD | 4 ++-- 12 files changed, 14 insertions(+), 15 deletions(-) diff --git a/libre/barebox-tools/PKGBUILD b/libre/barebox-tools/PKGBUILD index 96049641a..50c895984 100644 --- a/libre/barebox-tools/PKGBUILD +++ b/libre/barebox-tools/PKGBUILD @@ -1,6 +1,6 @@ # Barebox: am335x # Contributor: Denis Carikli -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers _pkgname=barebox pkgname=barebox-tools diff --git a/libre/java-assertj/PKGBUILD b/libre/java-assertj/PKGBUILD index fbf78b6eb..596633247 100644 --- a/libre/java-assertj/PKGBUILD +++ b/libre/java-assertj/PKGBUILD @@ -1,7 +1,7 @@ # Copyright (C) 2022 Denis 'GNUtoo' Carikli # This program is free software: you can redistribute it and/or modify # it under the terms of the CC0 1.0 License. -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers pkgname=java-assertj pkgver=3.8.0 diff --git a/libre/linux-libre-vanilla/PKGBUILD b/libre/linux-libre-vanilla/PKGBUILD index d301a11a5..06e454c09 100644 --- a/libre/linux-libre-vanilla/PKGBUILD +++ b/libre/linux-libre-vanilla/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Michał Masłowski # Contributor: Luke R. # Contributor: Andreas Grapentin -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers # Based on linux package diff --git a/libre/parabola-base/PKGBUILD b/libre/parabola-base/PKGBUILD index 347949730..c1c7e367f 100644 --- a/libre/parabola-base/PKGBUILD +++ b/libre/parabola-base/PKGBUILD @@ -1,5 +1,5 @@ # Contributor: bill-auger -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers # this is the canonical definition of the standard Parabola systemd CLI system # as installed onto the systemd CLI LiveISOs, and installed by the installers diff --git a/libre/parabola-vmbootstrap/PKGBUILD b/libre/parabola-vmbootstrap/PKGBUILD index f5ba16ad1..df3e3fab6 100644 --- a/libre/parabola-vmbootstrap/PKGBUILD +++ b/libre/parabola-vmbootstrap/PKGBUILD @@ -2,7 +2,7 @@ # Copyright (C) 2019,2020,2021 bill-auger # This program is free software: you can redistribute it and/or modify # it under the terms of the CC0 1.0 License. -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers pkgname=parabola-vmbootstrap pkgver=20200401 diff --git a/libre/powerpc64le-linux-gnu-gcc-initial/PKGBUILD b/libre/powerpc64le-linux-gnu-gcc-initial/PKGBUILD index cec36d30d..c635fc96c 100644 --- a/libre/powerpc64le-linux-gnu-gcc-initial/PKGBUILD +++ b/libre/powerpc64le-linux-gnu-gcc-initial/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers _target=powerpc64le-linux-gnu pkgname=$_target-gcc-initial diff --git a/libre/pureos-archive-keyring/PKGBUILD b/libre/pureos-archive-keyring/PKGBUILD index 559f68ac6..f9c612062 100644 --- a/libre/pureos-archive-keyring/PKGBUILD +++ b/libre/pureos-archive-keyring/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # This PKGBUILD is based on Arch's ubuntu-keyring version 2018.02.28-1.0 # Contributor: Denis 'GNUtoo' Carikli -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers pkgname=pureos-archive-keyring pkgver=2016.09 diff --git a/libre/uboot4extlinux-imx/PKGBUILD b/libre/uboot4extlinux-imx/PKGBUILD index 4b71d5ad3..99f0520d5 100644 --- a/libre/uboot4extlinux-imx/PKGBUILD +++ b/libre/uboot4extlinux-imx/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Isaac David # Contributor: André Silva # Contributor: Timothy Redaelli -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers # TODO: # - Add the following boards diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD index a2b8ca12c..7a311695d 100644 --- a/libre/uboot4extlinux-sunxi/PKGBUILD +++ b/libre/uboot4extlinux-sunxi/PKGBUILD @@ -1,9 +1,8 @@ -# U-Boot: sunXi -# Maintainer: Isaac David +# Contributor: Isaac David # Contributor: André Silva # Contributor: Timothy Redaelli # Contributor: Denis 'GNUtoo' Carikli -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers # To add a new board (that uses an Allwinner System On a Chip) you need: # - The package name. Example: uboot4extlinux-a20-olinuxino_micro diff --git a/libre/x86_64-pc-linux-gnu-binutils/PKGBUILD b/libre/x86_64-pc-linux-gnu-binutils/PKGBUILD index d3fa9a527..891ba8251 100644 --- a/libre/x86_64-pc-linux-gnu-binutils/PKGBUILD +++ b/libre/x86_64-pc-linux-gnu-binutils/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers _target=x86_64-pc-linux-gnu pkgname=$_target-binutils diff --git a/libre/x86_64-pc-linux-gnu-gcc/PKGBUILD b/libre/x86_64-pc-linux-gnu-gcc/PKGBUILD index d8e9a863a..795039d65 100644 --- a/libre/x86_64-pc-linux-gnu-gcc/PKGBUILD +++ b/libre/x86_64-pc-linux-gnu-gcc/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers _target=x86_64-pc-linux-gnu pkgname=$_target-gcc diff --git a/pcr/libreboot-utils/PKGBUILD b/pcr/libreboot-utils/PKGBUILD index ef97b05f0..1a27c1182 100644 --- a/pcr/libreboot-utils/PKGBUILD +++ b/pcr/libreboot-utils/PKGBUILD @@ -1,7 +1,7 @@ +# SPDX-License-Identifier: CC0-1.0 # Copyright (C) 2022 Denis 'GNUtoo' Carikli # Copyright (C) 2022 Wael Karram -# SPDX-License-Identifier: CC0-1.0 -# Maintainers: Parabola hackers +# Maintainer: Parabola Hackers pkgname=libreboot-utils pkgrel=15 -- cgit v1.2.3 From 2187e3ffefad9f0133cede7f90cdda88c955b44d Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sun, 24 Jul 2022 02:56:41 -0400 Subject: wip - linux-libre-64 --- libre/linux-libre-64/PKGBUILD | 70 +++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 23 deletions(-) diff --git a/libre/linux-libre-64/PKGBUILD b/libre/linux-libre-64/PKGBUILD index fc190ef36..12c942541 100644 --- a/libre/linux-libre-64/PKGBUILD +++ b/libre/linux-libre-64/PKGBUILD @@ -85,8 +85,24 @@ # and it is obvious which parts are intended to become aarch64-specific, # or exist only for cross-compiling the 64-bit foreign kernels for armv7h and i686. # After that, this PKGBUILD could be simplified, to focus only on the cross-compiled kernels. - - +# comments: +# TODO: repalce in 'linux-libre' PKGBUILD +# cross-compile over-ride +# TODO: merge into 'linux-libre' PKGBUILD + + +# TODO: This is a bug (in the 'linux-libre' PKGBUILD) for migrations from archlinuxarm. +# _replacesarchkernel assumes that the upstream kernel packages are named like: +# - 'linux' 'linux-headers' +# - 'linux-hardened' 'linux-hardened-headers' +# - 'linux-lts' 'linux-lts-headers' +# That is true for arch and arch32; but archlinuxarm has no packages by those names. +# Archlinuxarm systems would have a kernel package named like: +# - 'linux-armv7' 'linux-armv7-headers' +# - 'linux-armv7-chromebook' +# - 'linux-veyron' 'linux-veyron-headers' +# - 'linux-aarch64' 'linux-aarch64-headers' +# so Parabola armv7h and aarch64 kernels would not replace any archlinuxarm kernel. _replacesarchkernel=('linux%') # '%' gets replaced with kernel suffix _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix @@ -95,18 +111,22 @@ pkgbase=linux-libre-64 # cross-compile over-ride pkgver=5.18.5 pkgrel=2 pkgdesc="The Linux-libre kernel and modules" # TODO: merge into 'linux-libre' PKGBUILD -pkgdesc+=' 64-bit (aarch64) for Parabola armv7h' # cross-compile over-ride rcnver=5.18.2 rcnrel=armv7-x6 url='https://linux-libre.fsfla.org/' arch=(i686 x86_64 armv7h) -arch=(armv7h) # cross-compile over-ride +arch=(armv7h i686) # cross-compile over-ride license=(GPL2) +conflicts_armv7h=(linux-libre-aarch64) # cross-compile over-ride +replaces_armv7h=( linux-libre-aarch64) # cross-compile over-ride +conflicts_i686=( linux-libre-x86_64 ) # cross-compile over-ride +replaces_i686=( linux-libre-x86_64 ) # cross-compile over-ride makedepends=( bc libelf pahole cpio perl tar xz xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra ) -makedepends_armv7h=(uboot-tools vboot-utils dtc) # required by linux-libre-chromebook +makedepends_i686+=('x86_64-pc-linux-gnu-gcc') +makedepends_armv7h=(kmod uboot-tools vboot-utils dtc) # required by linux-libre-chromebook makedepends_armv7h+=(aarch64-linux-gnu-gcc-initial) # cross-compile over-ride options=('!strip') _srcname=linux-5.18 @@ -121,6 +141,7 @@ source=( 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 + # 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 @@ -206,6 +227,7 @@ _replacesarchkernel=("${_replacesarchkernel[@]/-64/}") # cross-compile over-ride case "$CARCH" in armv7h) KARCH=arm64 ; CROSS_COMPILE=aarch64-linux-gnu- ;; # cross-compile over-ride aarch64) KARCH=arm64;; # TODO: merge into 'linux-libre' PKGBUILD + i686) KARCH=x86;CROSS_COMPILE=x86_64-pc-linux-gnu-;; # cross-compile over-ride i686|x86_64) KARCH=x86;; armv7h) KARCH=arm;; esac @@ -309,16 +331,18 @@ _package() { conflicts+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") replaces+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") # cross-compile over-rides - # NOTE: Above is providing/replacing the archarm armv7h 'linux' with the armv7h 'linux-libre'. - # We do not want this aarch64 'linux-libre-64' to provide nor replace the archarm armv7h 'linux'; - # for the obvious reason. Anyways, the parabola armv7h 'linux-libre' serves that purpose. - # Below is providing/replacing 'linux-libre' and the obsoleted parabola 'linux-libre-aarch64'. + # NOTE: Above is providing an upstream 'linux{,-*}' (eg: linux, linux-hardened), + # and replacing the same during migration to Parabola. + # Below is providing 'linux-libre' for 'parabola-base', + # and replacing the obsoleted parabola 'linux-libre-{aarch64,x86_64}'. # These are defined analogously in _package-headers(), _package-docs(), and _package-chromebook(). - conflicts=( ${conflicts[*]/linux*/} ) # cross-compile over-ride - replaces=( ${replaces[*]/linux*/} ) # cross-compile over-ride - provides_armv7h=( linux-libre ) # cross-compile over-ride - conflicts_armv7h=( linux-libre linux-libre-aarch64 ) # cross-compile over-ride - replaces_armv7h=( linux-libre linux-libre-aarch64 ) # cross-compile over-ride + provides+=( linux-libre ) # cross-compile over-ride + conflicts=( ${conflicts[*]/linux*/} ) # cross-compile over-ride + replaces=( ${replaces[*]/linux*/} ) # cross-compile over-ride + conflicts_armv7h=( linux-libre-aarch64 ) # cross-compile over-ride + replaces_armv7h=( linux-libre-aarch64 ) # cross-compile over-ride + conflicts_i686=( linux-libre-x86_64 ) # cross-compile over-ride + replaces_i686=( linux-libre-x86_64 ) # cross-compile over-ride cd $_srcname local kernver="$(