Build kernel

Update hello world
Use pmos runner
2022-03-11 20:41:02 +01:00 · 2022-03-11 19:49:32 +01:00 · 2022-03-11 19:49:02 +01:00
1040 changed files with 34644 additions and 95244 deletions
@@ -121,10 +121,6 @@ def main():
        print("it more easily. Many times one person did a port with basic")
        print("functionality, and then someone else jumped in and")
        print("contributed major new features.")
-        print("")
-        print("NOTE: if you renamed a device in pmaports, rename it in the")
-        print("wiki as well and make sure to add it here:")
-        print("https://postmarketos.org/renamed")
        return 1
    else:
        print("*** Wiki check successful!")
@@ -26,8 +26,10 @@ sh_files="
 	./main/postmarketos-update-kernel/update-kernel.sh
 	./main/swclock-offset/swclock-offset-boot.sh
 	./main/swclock-offset/swclock-offset-shutdown.sh
+	./main/ttyescape/*.sh
 	./main/ttyescape/*.post-install
 	./main/unl0kr/unlock.sh
+	./main/msm-firmware-loader/*.sh
 	./main/msm-firmware-loader/*.post-install

 	$(find . -path './main/postmarketos-ui-*/*.sh')
@@ -17,9 +17,12 @@ def test_aports_firmware(args):
    excluded = [
        "firmware-motorola-potter",  # Depends on soc-qcom-msm8916-ucm
        "firmware-oneplus-msm8998",  # Depends on soc-qcom-sdm845-nonfree-firmware
+        "firmware-oneplus-sdm845",  # Depends on soc-qcom-sdm845-nonfree-firmware
        "firmware-samsung-baffinlite",  # Depends on firmware-aosp-broadcom-wlan
        "firmware-samsung-crespo",  # Depends on firmware-aosp-broadcom-wlan
        "firmware-samsung-maguro",  # Depends on firmware-aosp-broadcom-wlan
+        "firmware-shift-sdm845",  # Depends on soc-qcom-sdm845-nonfree-firmware
+        "firmware-xiaomi-beryllium",  # Depends on soc-qcom-sdm845-nonfree-firmware
        "firmware-xiaomi-ferrari",  # Depends on soc-qcom-msm8916
        "firmware-xiaomi-willow",  # Doesn't build, source link is dead (pma#1212)
    ]
@@ -15,9 +15,7 @@ def test_aports_ui(args):
    """
    Raise an error if package in _pmb_recommends is not found
    """
-    pmaports_cfg = pmb.config.pmaports.read_config(args)
-
-    for arch in pmaports_cfg["supported_arches"].split(","):
+    for arch in pmb.config.build_device_architectures:
        for path in glob.iglob(args.aports + "/main/postmarketos-ui-*/APKBUILD"):
            apkbuild = pmb.parse.apkbuild(path)
            # Skip if arch isn't enabled
@@ -153,10 +153,16 @@ build-x86:
  extends: .build

 build-aarch64:
+  tags:
+    - aarch64
  extends: .build

 build-armv7:
+  tags:
+    - aarch64
  extends: .build

 build-armhf:
+  tags:
+    - aarch64
  extends: .build
@@ -3,12 +3,8 @@
 device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
 device/*/*-purism-librem5/          @craftyguy @bshah
 main/osk-sdl/                       @craftyguy
+main/mesa-pvr-dri-classic/          @xc-racer99
 main/postmarketos-ui-plasma-mobile/ @bshah
 temp/u-boot-librem5/                @craftyguy @bshah
-device/community/*-qcom-sdm845      @calebccff @joelselvaraj
-device/community/device-oneplus-enchilada   @calebccff
-device/community/device-oneplus-fajita      @calebccff
-main/ttyescape                      @calebccff
-device/community/*-xiaomi-berrylium @joelselvaraj

 # vim: ts=4 sw=4 et
@@ -8,14 +8,8 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge

-[v22.06]
-description=Latest release / Recommended for best stability
-branch_pmaports=v22.06
-branch_aports=3.16-stable
-mirrordir_alpine=v3.16
-
 [v21.12]
-description=Old release (unsupported)
+description=Latest release / Recommended for best stability
 branch_pmaports=v21.12
 branch_aports=3.15-stable
 mirrordir_alpine=v3.15
@@ -4,7 +4,7 @@

 pkgname=binutils-aarch64
 pkgver=2.38
-pkgrel=3
+pkgrel=1
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -17,9 +17,6 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
 	binutils-ppc-fix-machine-options.patch
-	binutils-s390x-1.patch
-	binutils-s390x-2.patch
-	binutils-ppc64le-assertion.patch
 	"
 builddir="$srcdir/binutils-$pkgver"

@@ -82,7 +79,4 @@ f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
 27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
-0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
-63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8  binutils-ppc64le-assertion.patch
 "
@@ -1,32 +0,0 @@
-From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Thu, 23 Jun 2022 17:50:30 +0930
-Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
-
-save_res stubs aren't written in ppc_build_one_stub, their offsets
-(which are zero) should not be checked.
-
-	* elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
-
-(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
---
- bfd/elf64-ppc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
-index cb12ed476d8..df503341fe9 100644
--- a/bfd/elf64-ppc.c
-+++ b/bfd/elf64-ppc.c
-@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
-   if (htab == NULL)
-     return false;
- 
-  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
-+  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
-+	      || stub_entry->type.main == ppc_stub_save_res);
-   loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
- 
-   htab->stub_count[stub_entry->type.main - 1] += 1;
-- 
-2.31.1
-
@@ -1,147 +0,0 @@
-From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:29:58 +0200
-Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
-
-No dynamic relocs are needed for TLS defined in an executable, the
-TP relative offset is known at link time.
-
-Fixes
-FAIL: Build pr22263-1
-
-bfd/
-	PR ld/22263
-	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
-	instead of bfd_link_pic for TLS.
-	(elf_s390_check_relocs): Likewise.
-	(allocate_dynrelocs): Likewise.
-	(elf_s390_relocate_section): Likewise.
-
-(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
---
- bfd/elf64-s390.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index e780efa7181..00ee386baab 100644
--- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
- 			 int r_type,
- 			 int is_local)
- {
-  if (bfd_link_pic (info))
-+  if (bfd_link_dll (info))
-     return r_type;
- 
-   switch (r_type)
-@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	case R_390_TLS_GOTIE20:
- 	case R_390_TLS_GOTIE64:
- 	case R_390_TLS_IEENT:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
- 
-@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
- 	    break;
- 
-	  if (!bfd_link_pic (info))
-+	  if (!bfd_link_dll (info))
- 	    break;
- 	  info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
-@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
-      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
-      we can save the dynamic TLS relocation.  */
-   if (h->got.refcount > 0
-      && !bfd_link_pic (info)
-+      && !bfd_link_dll (info)
-       && h->dynindx == -1
-       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
-     {
-@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  /* Relocations for tls literal pool entries.  */
- 	case R_390_TLS_IE64:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    {
- 	      Elf_Internal_Rela outrel;
- 	      asection *sreloc;
-@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  else if (h != NULL)
- 	    {
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
-+	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
- 		r_type = R_390_TLS_LE64;
- 	    }
- 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
-@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	      if (local_got_offsets == NULL)
- 		abort();
- 	      off = local_got_offsets[r_symndx];
-	      if (bfd_link_pic (info))
-+	      if (bfd_link_dll (info))
- 		goto emit_tls_relocs;
- 	    }
- 	  else
- 	    {
- 	      off = h->got.offset;
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
-+	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
- 		goto emit_tls_relocs;
- 	    }
- 
-@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  break;
- 
- 	case R_390_TLS_LDM64:
-	  if (! bfd_link_pic (info))
-+	  if (! bfd_link_dll (info))
- 	    /* The literal pool entry this relocation refers to gets ignored
- 	       by the optimized code of the local exec model. Do nothing
- 	       and the value will turn out zero.  */
-@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  continue;
- 
- 	case R_390_TLS_LDO64:
-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
-+	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
- 	    relocation -= dtpoff_base (info);
- 	  else
- 	    /* When converting LDO to LE, we must negate.  */
-@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  if (r_type == R_390_TLS_LOAD)
- 	    {
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* IE->LE transition. Four valid cases:
- 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
-@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 		  invalid_tls_insn (input_bfd, input_section, rel);
- 		  return false;
- 		}
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* GD->LE transition.
- 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
-@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	    }
- 	  else if (r_type == R_390_TLS_LDCALL)
- 	    {
-	      if (!bfd_link_pic (info))
-+	      if (!bfd_link_dll (info))
- 		{
- 		  unsigned int insn0, insn1;
- 
-- 
-2.27.0
-
@@ -1,51 +0,0 @@
-From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:30:55 +0200
-Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
-
-In static-pie case, there are IRELATIVE-relocs in
-.rela.iplt (htab->irelplt), which will later be grouped
-to .rela.plt.  On s390, the IRELATIVE relocations are
-always located in .rela.iplt - even for non-static case.
-Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-to the dynamic section even if htab->srelplt->size == 0.
-See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
-
-bfd/
-	elf64-s390.c (elf_s390_size_dynamic_sections):
-	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
-
-(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
---
- bfd/elf64-s390.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index 00ee386baab..0b851f7ac0e 100644
--- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-       else if (startswith (bfd_section_name (s), ".rela"))
- 	{
- 	  if (s->size != 0 && s != htab->elf.srelplt)
-	    relocs = true;
-+	    {
-+	      relocs = true;
-+	      if (s == htab->elf.irelplt)
-+		{
-+		  /* In static-pie case, there are IRELATIVE-relocs in
-+		     .rela.iplt (htab->irelplt), which will later be grouped
-+		     to .rela.plt.  On s390, the IRELATIVE relocations are
-+		     always located in .rela.iplt - even for non-static case.
-+		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-+		     to the dynamic section even if htab->srelplt->size == 0.
-+		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
-+		  htab->elf.dt_jmprel_required = true;
-+		}
-+	    }
- 
- 	  /* We use the reloc_count field as a counter if we need
- 	     to copy relocs into the output file.  */
-- 
-2.27.0
-
@@ -4,7 +4,7 @@

 pkgname=binutils-armhf
 pkgver=2.38
-pkgrel=3
+pkgrel=1
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -17,9 +17,6 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
 	binutils-ppc-fix-machine-options.patch
-	binutils-s390x-1.patch
-	binutils-s390x-2.patch
-	binutils-ppc64le-assertion.patch
 	"
 builddir="$srcdir/binutils-$pkgver"

@@ -82,7 +79,4 @@ f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
 27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
-0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
-63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8  binutils-ppc64le-assertion.patch
 "
@@ -1,32 +0,0 @@
-From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Thu, 23 Jun 2022 17:50:30 +0930
-Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
-
-save_res stubs aren't written in ppc_build_one_stub, their offsets
-(which are zero) should not be checked.
-
-	* elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
-
-(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
---
- bfd/elf64-ppc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
-index cb12ed476d8..df503341fe9 100644
--- a/bfd/elf64-ppc.c
-+++ b/bfd/elf64-ppc.c
-@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
-   if (htab == NULL)
-     return false;
- 
-  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
-+  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
-+	      || stub_entry->type.main == ppc_stub_save_res);
-   loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
- 
-   htab->stub_count[stub_entry->type.main - 1] += 1;
-- 
-2.31.1
-
@@ -1,147 +0,0 @@
-From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:29:58 +0200
-Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
-
-No dynamic relocs are needed for TLS defined in an executable, the
-TP relative offset is known at link time.
-
-Fixes
-FAIL: Build pr22263-1
-
-bfd/
-	PR ld/22263
-	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
-	instead of bfd_link_pic for TLS.
-	(elf_s390_check_relocs): Likewise.
-	(allocate_dynrelocs): Likewise.
-	(elf_s390_relocate_section): Likewise.
-
-(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
---
- bfd/elf64-s390.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index e780efa7181..00ee386baab 100644
--- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
- 			 int r_type,
- 			 int is_local)
- {
-  if (bfd_link_pic (info))
-+  if (bfd_link_dll (info))
-     return r_type;
- 
-   switch (r_type)
-@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	case R_390_TLS_GOTIE20:
- 	case R_390_TLS_GOTIE64:
- 	case R_390_TLS_IEENT:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
- 
-@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
- 	    break;
- 
-	  if (!bfd_link_pic (info))
-+	  if (!bfd_link_dll (info))
- 	    break;
- 	  info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
-@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
-      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
-      we can save the dynamic TLS relocation.  */
-   if (h->got.refcount > 0
-      && !bfd_link_pic (info)
-+      && !bfd_link_dll (info)
-       && h->dynindx == -1
-       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
-     {
-@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  /* Relocations for tls literal pool entries.  */
- 	case R_390_TLS_IE64:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    {
- 	      Elf_Internal_Rela outrel;
- 	      asection *sreloc;
-@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  else if (h != NULL)
- 	    {
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
-+	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
- 		r_type = R_390_TLS_LE64;
- 	    }
- 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
-@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	      if (local_got_offsets == NULL)
- 		abort();
- 	      off = local_got_offsets[r_symndx];
-	      if (bfd_link_pic (info))
-+	      if (bfd_link_dll (info))
- 		goto emit_tls_relocs;
- 	    }
- 	  else
- 	    {
- 	      off = h->got.offset;
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
-+	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
- 		goto emit_tls_relocs;
- 	    }
- 
-@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  break;
- 
- 	case R_390_TLS_LDM64:
-	  if (! bfd_link_pic (info))
-+	  if (! bfd_link_dll (info))
- 	    /* The literal pool entry this relocation refers to gets ignored
- 	       by the optimized code of the local exec model. Do nothing
- 	       and the value will turn out zero.  */
-@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  continue;
- 
- 	case R_390_TLS_LDO64:
-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
-+	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
- 	    relocation -= dtpoff_base (info);
- 	  else
- 	    /* When converting LDO to LE, we must negate.  */
-@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  if (r_type == R_390_TLS_LOAD)
- 	    {
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* IE->LE transition. Four valid cases:
- 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
-@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 		  invalid_tls_insn (input_bfd, input_section, rel);
- 		  return false;
- 		}
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* GD->LE transition.
- 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
-@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	    }
- 	  else if (r_type == R_390_TLS_LDCALL)
- 	    {
-	      if (!bfd_link_pic (info))
-+	      if (!bfd_link_dll (info))
- 		{
- 		  unsigned int insn0, insn1;
- 
-- 
-2.27.0
-
@@ -1,51 +0,0 @@
-From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:30:55 +0200
-Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
-
-In static-pie case, there are IRELATIVE-relocs in
-.rela.iplt (htab->irelplt), which will later be grouped
-to .rela.plt.  On s390, the IRELATIVE relocations are
-always located in .rela.iplt - even for non-static case.
-Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-to the dynamic section even if htab->srelplt->size == 0.
-See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
-
-bfd/
-	elf64-s390.c (elf_s390_size_dynamic_sections):
-	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
-
-(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
---
- bfd/elf64-s390.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index 00ee386baab..0b851f7ac0e 100644
--- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-       else if (startswith (bfd_section_name (s), ".rela"))
- 	{
- 	  if (s->size != 0 && s != htab->elf.srelplt)
-	    relocs = true;
-+	    {
-+	      relocs = true;
-+	      if (s == htab->elf.irelplt)
-+		{
-+		  /* In static-pie case, there are IRELATIVE-relocs in
-+		     .rela.iplt (htab->irelplt), which will later be grouped
-+		     to .rela.plt.  On s390, the IRELATIVE relocations are
-+		     always located in .rela.iplt - even for non-static case.
-+		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-+		     to the dynamic section even if htab->srelplt->size == 0.
-+		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
-+		  htab->elf.dt_jmprel_required = true;
-+		}
-+	    }
- 
- 	  /* We use the reloc_count field as a counter if we need
- 	     to copy relocs into the output file.  */
-- 
-2.27.0
-
@@ -4,7 +4,7 @@

 pkgname=binutils-armv7
 pkgver=2.38
-pkgrel=3
+pkgrel=1
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
@@ -17,9 +17,6 @@ source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 	binutils-mips-disable-assert.patch
 	binutils-ppc-fix-machine-options.patch
-	binutils-s390x-1.patch
-	binutils-s390x-2.patch
-	binutils-ppc64le-assertion.patch
 	"
 builddir="$srcdir/binutils-$pkgver"

@@ -82,7 +79,4 @@ f55cf2e0bf82f97583a1abe10710e4013ecf7d64f1da2ef8659a44a06d0dd8beaf58dab98a183488
 70ec22bd72ef6dddecfd970613387dd4a8cdc8730dd3cbf03d5a0c3a7c4d839383167bb06dad21bf7c235329fd44b5dc4aefe762f68544f17155cf002bf1be4a  0001-Revert-PR25882-.gnu.attributes-are-not-checked-for-s.patch
 609cd90d8b334eb309f586b17b9d335a08d3dbb6def7c3eb5c010028fcb681674031e5b9d853aa7a39a50304356a86afc184b85562b3f228f8197f4d29395c8f  binutils-mips-disable-assert.patch
 27ea91e0e406e2ed464fd692cf92a07e338781789f2d968c8b95d9d5545985056a6f7f500df3952e5ab42165db28b741aa33d6b717e880b11a2e41fe406b13c4  binutils-ppc-fix-machine-options.patch
-a9efe2689624865f0ff33d4776a5bd295bcad6484bdd38d0ca490fea43691c4933ab33d17478851998eef12922dbf83d6c3225bb1f8faf92a1367d086390f7d3  binutils-s390x-1.patch
-0e291df80ad279005265634014d0935d2c115a5ed708d25407094b7ad4ddf267d1fb7fcbcb2d9ad73bd305b4e3974628b820bd1f249f56c095e4896872434cc9  binutils-s390x-2.patch
-63e58f45df3570279cb1ee5215ba3de77de012cac20da9cdd23f86a93890056e1efa397521559cfd0716d5239604607c440d8f4d089d83c98b8fbc1b5c5305f8  binutils-ppc64le-assertion.patch
 "
@@ -1,32 +0,0 @@
-From 97dd8079feb35456d7b387a594b5e00f7654b3b8 Mon Sep 17 00:00:00 2001
-From: Alan Modra <amodra@gmail.com>
-Date: Thu, 23 Jun 2022 17:50:30 +0930
-Subject: [PATCH] PowerPC64: fix assertion in ppc_build_one_stub with -Os code
-
-save_res stubs aren't written in ppc_build_one_stub, their offsets
-(which are zero) should not be checked.
-
-	* elf64-ppc.c (ppc_build_one_stub): Don't check save_res offsets.
-
-(cherry picked from commit 570e911f4e533fad33ad5e4e1102929cf7e80bd7)
---
- bfd/elf64-ppc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
-index cb12ed476d8..df503341fe9 100644
--- a/bfd/elf64-ppc.c
-+++ b/bfd/elf64-ppc.c
-@@ -11700,7 +11700,8 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
-   if (htab == NULL)
-     return false;
- 
-  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size);
-+  BFD_ASSERT (stub_entry->stub_offset >= stub_entry->group->stub_sec->size
-+	      || stub_entry->type.main == ppc_stub_save_res);
-   loc = stub_entry->group->stub_sec->contents + stub_entry->stub_offset;
- 
-   htab->stub_count[stub_entry->type.main - 1] += 1;
-- 
-2.31.1
-
@@ -1,147 +0,0 @@
-From 82a5bb730a16f8c7962568030268e784b4fb42c8 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:29:58 +0200
-Subject: [PATCH] s390: Avoid dynamic TLS relocs in PIE
-
-No dynamic relocs are needed for TLS defined in an executable, the
-TP relative offset is known at link time.
-
-Fixes
-FAIL: Build pr22263-1
-
-bfd/
-	PR ld/22263
-	* elf64-s390.c (elf_s390_tls_transition): Use bfd_link_dll
-	instead of bfd_link_pic for TLS.
-	(elf_s390_check_relocs): Likewise.
-	(allocate_dynrelocs): Likewise.
-	(elf_s390_relocate_section): Likewise.
-
-(cherry picked from commit 26b1426577b5dcb32d149c64cca3e603b81948a9)
---
- bfd/elf64-s390.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index e780efa7181..00ee386baab 100644
--- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -774,7 +774,7 @@ elf_s390_tls_transition (struct bfd_link_info *info,
- 			 int r_type,
- 			 int is_local)
- {
-  if (bfd_link_pic (info))
-+  if (bfd_link_dll (info))
-     return r_type;
- 
-   switch (r_type)
-@@ -1026,7 +1026,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	case R_390_TLS_GOTIE20:
- 	case R_390_TLS_GOTIE64:
- 	case R_390_TLS_IEENT:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
- 
-@@ -1107,7 +1107,7 @@ elf_s390_check_relocs (bfd *abfd,
- 	  if (r_type == R_390_TLS_LE64 && bfd_link_pie (info))
- 	    break;
- 
-	  if (!bfd_link_pic (info))
-+	  if (!bfd_link_dll (info))
- 	    break;
- 	  info->flags |= DF_STATIC_TLS;
- 	  /* Fall through */
-@@ -1571,7 +1571,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h,
-      to R_390_TLS_LE64 requiring no TLS entry. For GOTIE12 and IEENT
-      we can save the dynamic TLS relocation.  */
-   if (h->got.refcount > 0
-      && !bfd_link_pic (info)
-+      && !bfd_link_dll (info)
-       && h->dynindx == -1
-       && elf_s390_hash_entry(h)->tls_type >= GOT_TLS_IE)
-     {
-@@ -2662,7 +2662,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  /* Relocations for tls literal pool entries.  */
- 	case R_390_TLS_IE64:
-	  if (bfd_link_pic (info))
-+	  if (bfd_link_dll (info))
- 	    {
- 	      Elf_Internal_Rela outrel;
- 	      asection *sreloc;
-@@ -2690,7 +2690,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  else if (h != NULL)
- 	    {
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (!bfd_link_pic (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
-+	      if (!bfd_link_dll (info) && h->dynindx == -1 && tls_type >= GOT_TLS_IE)
- 		r_type = R_390_TLS_LE64;
- 	    }
- 	  if (r_type == R_390_TLS_GD64 && tls_type >= GOT_TLS_IE)
-@@ -2801,14 +2801,14 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	      if (local_got_offsets == NULL)
- 		abort();
- 	      off = local_got_offsets[r_symndx];
-	      if (bfd_link_pic (info))
-+	      if (bfd_link_dll (info))
- 		goto emit_tls_relocs;
- 	    }
- 	  else
- 	    {
- 	      off = h->got.offset;
- 	      tls_type = elf_s390_hash_entry(h)->tls_type;
-	      if (bfd_link_pic (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
-+	      if (bfd_link_dll (info) || h->dynindx != -1 || tls_type < GOT_TLS_IE)
- 		goto emit_tls_relocs;
- 	    }
- 
-@@ -2825,7 +2825,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  break;
- 
- 	case R_390_TLS_LDM64:
-	  if (! bfd_link_pic (info))
-+	  if (! bfd_link_dll (info))
- 	    /* The literal pool entry this relocation refers to gets ignored
- 	       by the optimized code of the local exec model. Do nothing
- 	       and the value will turn out zero.  */
-@@ -2900,7 +2900,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	  continue;
- 
- 	case R_390_TLS_LDO64:
-	  if (bfd_link_pic (info) || (input_section->flags & SEC_DEBUGGING))
-+	  if (bfd_link_dll (info) || (input_section->flags & SEC_DEBUGGING))
- 	    relocation -= dtpoff_base (info);
- 	  else
- 	    /* When converting LDO to LE, we must negate.  */
-@@ -2922,7 +2922,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 
- 	  if (r_type == R_390_TLS_LOAD)
- 	    {
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* IE->LE transition. Four valid cases:
- 		     lg %rx,(0,%ry)    -> sllg %rx,%ry,0
-@@ -2972,7 +2972,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 		  invalid_tls_insn (input_bfd, input_section, rel);
- 		  return false;
- 		}
-	      if (!bfd_link_pic (info) && (h == NULL || h->dynindx == -1))
-+	      if (!bfd_link_dll (info) && (h == NULL || h->dynindx == -1))
- 		{
- 		  /* GD->LE transition.
- 		     brasl %r14,__tls_get_addr@plt -> brcl 0,. */
-@@ -2991,7 +2991,7 @@ elf_s390_relocate_section (bfd *output_bfd,
- 	    }
- 	  else if (r_type == R_390_TLS_LDCALL)
- 	    {
-	      if (!bfd_link_pic (info))
-+	      if (!bfd_link_dll (info))
- 		{
- 		  unsigned int insn0, insn1;
- 
-- 
-2.27.0
-
@@ -1,51 +0,0 @@
-From 9a01457e02e7bb594ff9a9ac62a38c909e2e3083 Mon Sep 17 00:00:00 2001
-From: Stefan Liebler <stli@linux.ibm.com>
-Date: Thu, 28 Apr 2022 14:30:55 +0200
-Subject: [PATCH] s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie
-
-In static-pie case, there are IRELATIVE-relocs in
-.rela.iplt (htab->irelplt), which will later be grouped
-to .rela.plt.  On s390, the IRELATIVE relocations are
-always located in .rela.iplt - even for non-static case.
-Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-to the dynamic section even if htab->srelplt->size == 0.
-See _bfd_elf_add_dynamic_tags in bfd/elflink.c.
-
-bfd/
-	elf64-s390.c (elf_s390_size_dynamic_sections):
-	Enforce DT_JMPREL via htab->elf.dt_jmprel_required.
-
-(cherry picked from commit d942d8db12adf4c9e5c7d9ed6496a779ece7149e)
---
- bfd/elf64-s390.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
-index 00ee386baab..0b851f7ac0e 100644
--- a/bfd/elf64-s390.c
-+++ b/bfd/elf64-s390.c
-@@ -1876,7 +1876,20 @@ elf_s390_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
-       else if (startswith (bfd_section_name (s), ".rela"))
- 	{
- 	  if (s->size != 0 && s != htab->elf.srelplt)
-	    relocs = true;
-+	    {
-+	      relocs = true;
-+	      if (s == htab->elf.irelplt)
-+		{
-+		  /* In static-pie case, there are IRELATIVE-relocs in
-+		     .rela.iplt (htab->irelplt), which will later be grouped
-+		     to .rela.plt.  On s390, the IRELATIVE relocations are
-+		     always located in .rela.iplt - even for non-static case.
-+		     Ensure that DT_JMPREL, DT_PLTRELA, DT_PLTRELASZ is added
-+		     to the dynamic section even if htab->srelplt->size == 0.
-+		     See _bfd_elf_add_dynamic_tags in bfd/elflink.c.  */
-+		  htab->elf.dt_jmprel_required = true;
-+		}
-+	    }
- 
- 	  /* We use the reloc_count field as a counter if we need
- 	     to copy relocs into the output file.  */
-- 
-2.27.0
-
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.35.0
-pkgrel=18
+pkgrel=5

 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-2dd9617a1e0938a692acdb5c0ed943197f100a87274df96bc3ed7f77e0a5713d4e8c9642a666bb0391c5ceebc50960cf4ef9a467c813d6f5a149c6bd89b2dc3a  busybox-static-1.35.0-r18-aarch64-edge.apk
+5be7db2e4793b74ffa487153b1ca52027b6d1a4ca316c152163d1b3030ba3270e645d02522f9c8187b14fc193b5471ccedc7439b38463fabeac08b404f1b6fbb  busybox-static-1.35.0-r5-aarch64-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.35.0
-pkgrel=18
+pkgrel=5

 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-35461f4429030b5841c6cb071aac692f42f4935c5b94f80b848c8a9ce217b25370f9bb0df167f6d597535708d3c1d25b8e12d6d9b57588c4291facbc7681dd03  busybox-static-1.35.0-r18-armhf-edge.apk
+dcfd4a8af7c0f2ae33cacdc933f38906c9173b9a6476b04624d0dce7bf03277328bc3422182cbf0cf784495ff663326779a39d4a259064d5a740f8bea4f5a3be  busybox-static-1.35.0-r5-armhf-edge.apk
 "
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.35.0
-pkgrel=18
+pkgrel=5

 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-e91b9f5bd8e21525c471aeaf83a4fdc86098e8245b2d4119a3e6717d3402e9e134cf8cae6df8b076f0020eaf8a4eda68cfa417d4319ba5be4b32daf480133dd4  busybox-static-1.35.0-r18-armv7-edge.apk
+2b2ff67a0cf0ab1b1fc67458f328c7b2e91a24a6c57d4d7707c5c88a68b715af11b2ee29381aaa15946d6bccaf3d6f899f8a760ff87df2156a59bd12e67af71d  busybox-static-1.35.0-r5-armv7-edge.apk
 "
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=4
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,15 +182,10 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
-	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
-		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-	fi
+	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -257,7 +252,6 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 	0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 	0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-	libgo-musl-1.2.3.patch
 	"

 # we build out-of-tree
@@ -440,12 +434,10 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+			mv "$i" "$pkgdir"/usr/lib/
+			ln -s ../../../../${i##*/} $i
+		done
 	fi

 	if [ "$CHOST" != "$CTARGET" ]; then
@@ -600,7 +592,6 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
-	provides="gcc-gdc-bootstrap=$_gccrel"

 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -712,7 +703,7 @@ libgnatstatic() {
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap=$_gccrel"
+	provides="$pkgname-gnat-bootstrap"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"

 	mkdir -p "$subpkgdir"/$_gcclibexec \
@@ -776,5 +767,4 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef
 160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4  0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864  0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e  0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93  libgo-musl-1.2.3.patch
 "
@@ -1,13 +0,0 @@
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104..06289a4 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then
- fi
- 
- # The syscall numbers.  We force the names to upper case.
-grep '^const _SYS_' gen-sysinfo.go | \
-+grep '^const _SYS_[a-z]' gen-sysinfo.go | \
-   sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \
-   while read sys; do
-     sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=4
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,15 +182,10 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
-	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
-		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-	fi
+	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -257,7 +252,6 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 	0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 	0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-	libgo-musl-1.2.3.patch
 	"

 # we build out-of-tree
@@ -440,12 +434,10 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+			mv "$i" "$pkgdir"/usr/lib/
+			ln -s ../../../../${i##*/} $i
+		done
 	fi

 	if [ "$CHOST" != "$CTARGET" ]; then
@@ -600,7 +592,6 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
-	provides="gcc-gdc-bootstrap=$_gccrel"

 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -712,7 +703,7 @@ libgnatstatic() {
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap=$_gccrel"
+	provides="$pkgname-gnat-bootstrap"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"

 	mkdir -p "$subpkgdir"/$_gcclibexec \
@@ -776,5 +767,4 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef
 160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4  0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864  0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e  0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93  libgo-musl-1.2.3.patch
 "
@@ -1,13 +0,0 @@
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104..06289a4 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then
- fi
- 
- # The syscall numbers.  We force the names to upper case.
-grep '^const _SYS_' gen-sysinfo.go | \
-+grep '^const _SYS_[a-z]' gen-sysinfo.go | \
-   sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \
-   while read sys; do
-     sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20220219
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=4
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -182,15 +182,10 @@ if $LANG_FORTRAN; then
 	_languages="$_languages,fortran"
 fi
 if $LANG_ADA; then
-	subpackages="$subpackages gcc-gnat$_target:gnat"
+	subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH gcc-gnat$_target:gnat"
 	_languages="$_languages,ada"
-	if [ "$CBUILD" = "$CTARGET" ]; then
-		makedepends_build="$makedepends_build gcc-gnat-bootstrap"
-		subpackages="$subpackages libgnat-static:libgnatstatic:$CTARGET_ARCH libgnat::$CTARGET_ARCH"
-	else
-		subpackages="$subpackages libgnat::$CTARGET_ARCH"
-		makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
-	fi
+	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
+	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 fi
 if $LANG_JIT; then
 	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
@@ -257,7 +252,6 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-${pkgver}.tar.xz
 	0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 	0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 	0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-	libgo-musl-1.2.3.patch
 	"

 # we build out-of-tree
@@ -440,12 +434,10 @@ package() {
 			mv "$i" "$pkgdir"/usr/lib/
 			ln -s ../../../../${i##*/} $i
 		done
-		if [ "$CHOST" = "$CTARGET" ]; then
-			for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
-				mv "$i" "$pkgdir"/usr/lib/
-				ln -s ../../../../${i##*/} $i
-			done
-		fi
+		for i in $(find "$pkgdir"/$_gcclibdir/adalib/ -type f -maxdepth 1 -name "libgna*.a"); do
+			mv "$i" "$pkgdir"/usr/lib/
+			ln -s ../../../../${i##*/} $i
+		done
 	fi

 	if [ "$CHOST" != "$CTARGET" ]; then
@@ -600,7 +592,6 @@ gdc() {
 	pkgdesc="GCC-based D language compiler"
 	depends="gcc=$_gccrel libgphobos=$_gccrel musl-dev"
 	depends="$depends libucontext-dev"
-	provides="gcc-gdc-bootstrap=$_gccrel"

 	mkdir -p "$subpkgdir/$_gcclibexec" \
 		"$subpkgdir"/$_gcclibdir/include/d/ \
@@ -712,7 +703,7 @@ libgnatstatic() {
 gnat() {
 	pkgdesc="Ada support for GCC"
 	depends="gcc=$_gccrel"
-	provides="$pkgname-gnat-bootstrap=$_gccrel"
+	provides="$pkgname-gnat-bootstrap"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libgnat=$_gccrel"

 	mkdir -p "$subpkgdir"/$_gcclibexec \
@@ -776,5 +767,4 @@ c44c6e5b28b622897af60e7e2dbf0d0284379eb57b39b480936e6d8b3743a24287c2a9ed69a530ef
 160ef16fde90546474e1548f1487c18d9b8edbae1d42a13ad06041b03214d06ff2c3586acd4d0bae27d48e48bb651861c6b9a140ade4ac59f00a268e85275da4  0049-properly-disable-fsplit-stack-on-non-glibc-targets-P.patch
 f4d9ebf6d5c80d2f303404b9bf315bf81435c0d369b03b92f8e8510d82db72c2a30d84603307ddc0697df3845862ba93045e4a3724f8e491e7c01bd4396d8864  0050-x86-Fix-fsplit-stack-feature-detection-via-TARGET_CA.patch
 8ac54b3a46f7270d975fa3e1198ac37a2311a4b9940938958ffc148e4e9c82c3e81cf3e3c3abd43cef29137897cd6768220b432f828672e036308f7994422d2e  0051-go-gospec-forcibly-disable-fsplit-stack-support.patch
-fa59b0fb081d97f8f63506b8793699588a95c602b5d468140eb1e80456597e52e1cc45dc0b234ac8e60e2b0cd606d94d111c8b0ae64c0a2be1bc1b8a184ceb93  libgo-musl-1.2.3.patch
 "
@@ -1,13 +0,0 @@
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 6fef104..06289a4 100755
--- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -126,7 +126,7 @@ if ! grep '^const SIGCLD ' ${OUT} >/dev/null 2>&1; then
- fi
- 
- # The syscall numbers.  We force the names to upper case.
-grep '^const _SYS_' gen-sysinfo.go | \
-+grep '^const _SYS_[a-z]' gen-sysinfo.go | \
-   sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \
-   while read sys; do
-     sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
@@ -1,17 +0,0 @@
-Avoid gcc/reload1.c compile error when building with newer gcc (e.g. gcc 11.2 on Ubuntu 21.10).
-
-The error was:
-
-.../esp-open-sdk/crosstool-NG/.build/src/gcc-4.8.5/gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
-
--- gcc-4.8.5/gcc/reload1.c~	2013-01-21 06:55:05.000000000 -0800
-+++ gcc-4.8.5/gcc/reload1.c	2022-01-05 17:18:10.148547719 -0800
-@@ -440,7 +440,7 @@
- 
-   while (memory_address_p (QImode, tem))
-     {
-      spill_indirect_levels++;
-+      spill_indirect_levels = 1;
-       tem = gen_rtx_MEM (Pmode, tem);
-     }
- 
@@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc4-aarch64
 pkgver=9999
 _pkgver=4.9.2
-pkgrel=4
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="http://gcc.gnu.org"
 arch="x86_64"
@@ -215,8 +215,6 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg
 	hardenednossp.specs
 	hardenednopie.specs
 	hardenednopiessp.specs
-
-	1001-fix-reload1-compile-error.patch
 	"

 # we build out-of-tree
@@ -434,8 +432,7 @@ package() {
 	done
 }

-sha512sums="
-35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
+sha512sums="35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
 618a8d037ccad15e60182acc9c85ba844cb9b5800a22ece0b814e43541b01b4e390a2847f86debb351f4b05580241747fde87e86a17060744e7bb2b9a3dc5bd4  01_all_gcc49_configure.patch
 21770259c7916e55568027926e4a543eea468b04436cc61c28f749be5a6635c48e68b7924a8eb19a76733a9d2f00921ba06faddaedbf14b1cdad5ab1810cc6c6  02_all_gcc48_config.in.patch
@@ -483,6 +480,4 @@ b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc2
 83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb  vanilla.specs
 e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12  hardenednossp.specs
 b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168  hardenednopie.specs
-f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs
-6f3d708269cc3f1d28ad9af8cd1206753b7d4ddde6589c303ce201d34b531f1abb73a14032a7f8e16c5ec3041e0c227b3451c09b1952a58893a64a2765d12a00  1001-fix-reload1-compile-error.patch
-"
+f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs"
@@ -1,17 +0,0 @@
-Avoid gcc/reload1.c compile error when building with newer gcc (e.g. gcc 11.2 on Ubuntu 21.10).
-
-The error was:
-
-.../esp-open-sdk/crosstool-NG/.build/src/gcc-4.8.5/gcc/reload1.c:89:24: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
-
--- gcc-4.8.5/gcc/reload1.c~	2013-01-21 06:55:05.000000000 -0800
-+++ gcc-4.8.5/gcc/reload1.c	2022-01-05 17:18:10.148547719 -0800
-@@ -440,7 +440,7 @@
- 
-   while (memory_address_p (QImode, tem))
-     {
-      spill_indirect_levels++;
-+      spill_indirect_levels = 1;
-       tem = gen_rtx_MEM (Pmode, tem);
-     }
- 
@@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET"
 pkgname=gcc4-armv7
 pkgver=9999
 _pkgver=4.9.2
-pkgrel=4
+pkgrel=2
 pkgdesc="Stage2 cross-compiler for armv7"
 url="http://gcc.gnu.org"
 arch="x86_64"
@@ -215,8 +215,6 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg
 	hardenednossp.specs
 	hardenednopie.specs
 	hardenednopiessp.specs
-
-	1001-fix-reload1-compile-error.patch
 	"

 # we build out-of-tree
@@ -434,8 +432,7 @@ package() {
 	done
 }

-sha512sums="
-35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
+sha512sums="35a1386ae2b8629cd464383fbb3c61e94a07f3691f48b8029b97cc62a60c792ffb870aad2343b2ad8185bf46f77e1e1dd62309ecdadc42f919874c6e2c58b936  gcc-4.9.2.tar.gz
 28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226  ecj-4.9.jar
 618a8d037ccad15e60182acc9c85ba844cb9b5800a22ece0b814e43541b01b4e390a2847f86debb351f4b05580241747fde87e86a17060744e7bb2b9a3dc5bd4  01_all_gcc49_configure.patch
 21770259c7916e55568027926e4a543eea468b04436cc61c28f749be5a6635c48e68b7924a8eb19a76733a9d2f00921ba06faddaedbf14b1cdad5ab1810cc6c6  02_all_gcc48_config.in.patch
@@ -483,6 +480,4 @@ b37195a126476775e2ef16e0adc9173664c514339fb319f628debd8a4133fa53e022278387c68fc2
 83a0996a48096032bcc674a6d28524f1cd2d81837621ebe4c15b5aedbd551c77ce5576b6307adb673ef0e4ac0431d935ad6a427edca2af5c21b6be9176bfaddb  vanilla.specs
 e4d38905527c500c61c421d782a8ac6ef2b034b15fd81d868486ac330a70922937d3c47e0684e9f3250744569b56a8df199499a4a5c107a6d544dca84458dc12  hardenednossp.specs
 b56f7c308c5aefd0cfc647abd75939508a6640c53fce7c19da7c7d8ef4405d29b0d88800117fc7ff8d0022b035d511fb6d478e745bb2ed12a1b63f9f8cf3e168  hardenednopie.specs
-f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs
-6f3d708269cc3f1d28ad9af8cd1206753b7d4ddde6589c303ce201d34b531f1abb73a14032a7f8e16c5ec3041e0c227b3451c09b1952a58893a64a2765d12a00  1001-fix-reload1-compile-error.patch
-"
+f5ac7282201006548ed2bd835234af64d6f79f13f0b9a3410f5c794537e0ea91601361ae72180f49870b6b0f9af5f16002c86660feb94df346b9b1d9602e9d3a  hardenednopiessp.specs"
@@ -3,7 +3,7 @@

 pkgname=grub-efi-x86
 pkgver=2.06
-pkgrel=5
+pkgrel=2

 _arch="x86"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -22,5 +22,5 @@ package() {
 }

 sha512sums="
-4470549744730a4911c2e6f9b38012057391cea40de2ee46375aaf826786acdf9e22f33df19b3f7c1fe7ee5cbc5ab2e412f0f6f85ea5513dc63e7f59be22bd5b  grub-efi-2.06-r5-x86-edge.apk
+ccdc2735380b7af8bc8cc6f4a143f2fa15037488184589fde1b4880883ebda6a722ce49c79e0da1cc4e0b316a4dcbc2b6f79ffa4f2333b826bddbfa4aadf76f1  grub-efi-2.06-r2-x86-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-aarch64
-pkgver=1.2.3
-pkgrel=1
+pkgver=1.2.2
+pkgrel=7
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-5e64669b00a77b19bb5e2a6a801950fff73a0c394734590ed2c3840905ac45faa9af9a21f186380d848ce713a000e93ef516f47fb5da54704e9313c9b62ed06d  musl-1.2.3-r1-aarch64-edge.apk
-51a515fab0e244373b62b572c67460f31e20d4b22db125dabc17b24e9bfbd1c87901f8d44a55d36d208a9a8650ebbb59995f8715e2c8ca90b531e0d74852ff8b  musl-dev-1.2.3-r1-aarch64-edge.apk
+9477f129facfcb46474e72a576714e762d03bc306dc6a64c246d793c9018f57baab7120f689a1f13f331158c6bdf06c82d6e43c19af1660363a9292b953ad48a  musl-1.2.2-r7-aarch64-edge.apk
+23b3fa1f6a2971dfd2444fe0f967b84e880e5862248c0bc5c5f4b56e91dc6dc6c1f849618a331c0fbaf74d1b6b6fbd592a4781db9b247dd4c5adf7c57aae3ffa  musl-dev-1.2.2-r7-aarch64-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armhf
-pkgver=1.2.3
-pkgrel=1
+pkgver=1.2.2
+pkgrel=7
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-ca5c7fc6c32375066b2be07474fafc06b6e975e8f9ecef9945ae32e5560a19e10be52643536a769db001c357d890d50888a3ec58336d659f5a328e35ef46e15d  musl-1.2.3-r1-armhf-edge.apk
-ae04dd543ff95e90915c9bb857b30a4f6ec9472fcbd679b047aeab6f62a10d79b8ae0bf6bd640d1ce5ebfe56dea5256889fcf6ae8727820358490120e1abddb5  musl-dev-1.2.3-r1-armhf-edge.apk
+aa7ea9cf329f9fae659575337b5a9c8cb885abe712c3fc7befe8c9161ce5dc0b30283a99f29ebf1df32dfb397ce03ff9a524b7fd0feb5e97dbfab0b3d9faa357  musl-1.2.2-r7-armhf-edge.apk
+21c8746f904cee6a0e3069fde337408fc3b6d73c29068401bfca991240f1ff99a3094820a829ace98981afc441c7d3d7754d95803328ea23279aee0be56bf215  musl-dev-1.2.2-r7-armhf-edge.apk
 "
@@ -7,8 +7,8 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armv7
-pkgver=1.2.3
-pkgrel=1
+pkgver=1.2.2
+pkgrel=7
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"

@@ -57,6 +57,6 @@ package_dev() {
 }

 sha512sums="
-040d2317fbd50d5285d6bcff405f0bc628c4f2420c4d6c593deedc4aea9154bdb031bff50c2cae29af3bb557bff927970ab111efd51b420b599bdde52bb94241  musl-1.2.3-r1-armv7-edge.apk
-69dff18d36e35ce245c672bd7212d881eaed457f70a6424f1637315181b7d6b832b140a6f469018c947a9bcee1b2e632305ac8ec0facf595dfdf7009790c6646  musl-dev-1.2.3-r1-armv7-edge.apk
+1ec15f6a2924eeabb8c247fdaafefd97a679afdde51749897f86afdcea721dae3af8cb9c3256c7793938003996f0665d8958d7f91291da2e37c4833dc7da0868  musl-1.2.2-r7-armv7-edge.apk
+476023adad8e9e14233741d491756159d6b93856c647efc030b2e538c15351e49000e1f84763b60a2f9f9283a6ddface81797120526fb7cebebb35adb1d9d4cd  musl-dev-1.2.2-r7-armv7-edge.apk
 "
@@ -1,44 +0,0 @@
-From 9d2231c5d74e13b2a0546fee6737ee4446017903 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann@ionos.com>
-Date: Mon, 21 Feb 2022 11:03:13 +0100
-Subject: lib/iov_iter: initialize "flags" in new pipe_buffer
-
-The functions copy_page_to_iter_pipe() and push_pipe() can both
-allocate a new pipe_buffer, but the "flags" member initializer is
-missing.
-
-Fixes: 241699cd72a8 ("new iov_iter flavour: pipe-backed")
-To: Alexander Viro <viro@zeniv.linux.org.uk>
-To: linux-fsdevel@vger.kernel.org
-To: linux-kernel@vger.kernel.org
-Cc: stable@vger.kernel.org
-Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
- lib/iov_iter.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/iov_iter.c b/lib/iov_iter.c
-index b0e0acdf96c15..6dd5330f7a995 100644
--- a/lib/iov_iter.c
-+++ b/lib/iov_iter.c
-@@ -414,6 +414,7 @@ static size_t copy_page_to_iter_pipe(struct page *page, size_t offset, size_t by
- 		return 0;
- 
- 	buf->ops = &page_cache_pipe_buf_ops;
-+	buf->flags = 0;
- 	get_page(page);
- 	buf->page = page;
- 	buf->offset = offset;
-@@ -577,6 +578,7 @@ static size_t push_pipe(struct iov_iter *i, size_t size,
- 			break;
- 
- 		buf->ops = &default_pipe_buf_ops;
-+		buf->flags = 0;
- 		buf->page = page;
- 		buf->offset = 0;
- 		buf->len = min_t(ssize_t, left, PAGE_SIZE);
-- 
-cgit 
-
-
@@ -1,24 +0,0 @@
-sprdfb_check_var() has two problems:
-I) it is not buffering-aware, which all Spreadtrum devices use;
-II) it checks values that are already in yres_virtual, not those that we
-are trying to overwrite.
-Those problems stop X11 and charging-sdl from working properly.
-X11 error:
-(EE) FBDEV(0): FBIOPUT_VSCREENINFO: Invalid argument
-This patch fixes first problem, however, the correct way is fixing
-the second one, as this might have less side effects.
-
-diff --git a/drivers/video/sprdfb/sprdfb_main.c b/drivers/video/sprdfb/sprdfb_main.c
-index 43876285..751616a1 100644
--- a/drivers/video/sprdfb/sprdfb_main.c
-+++ b/drivers/video/sprdfb/sprdfb_main.c
-@@ -531,7 +531,8 @@ static int sprdfb_check_var(struct fb_var_screeninfo *var, struct fb_info *fb)
- 	if ((var->xres != fb->var.xres) ||
- 		(var->yres != fb->var.yres) ||
- 		(var->xres_virtual != fb->var.xres_virtual) ||
-		(var->yres_virtual != fb->var.yres_virtual) ||
-+		// (var->yres_virtual != fb->var.yres_virtual) ||
-+	    	(fb->var.yres_virtual % var->yres_virtual != 0) ||
- 		(var->xoffset != fb->var.xoffset) ||
- #ifndef BIT_PER_PIXEL_SURPPORT
- 		(var->bits_per_pixel != fb->var.bits_per_pixel) ||
@@ -1,15 +0,0 @@
-By default, color channels on Spreadtrum devices are swapped. This patch makes kernel use BGR565, which has normal color channels.
-
-diff --git a/drivers/video/sprdfb/sprdfb_main.c b/drivers/video/sprdfb/sprdfb_main.c
-index 3e6c70d..80fceb9 100644
--- a/drivers/video/sprdfb/sprdfb_main.c
-+++ b/drivers/video/sprdfb/sprdfb_main.c
-@@ -51,7 +51,7 @@ enum{
- 	SPRD_IN_DATA_TYPE_LIMIT
- };
- 
-#define SPRDFB_IN_DATA_TYPE SPRD_IN_DATA_TYPE_ABGR888
-+#define SPRDFB_IN_DATA_TYPE SPRD_IN_DATA_TYPE_BGR565
- 
- #ifdef CONFIG_FB_TRIPLE_FRAMEBUFFER
- #define FRAMEBUFFER_NR		(3)
@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-asus-me176c
 pkgdesc="ASUS MeMO Pad 7 (ME176C(X))"
-pkgver=5
-pkgrel=0
+pkgver=3
+pkgrel=3
 _commit=3155254999ac36c3051a2118c415de25a072c0f6
 url="https://postmarketos.org"
 license="MIT"
@@ -16,20 +16,15 @@ depends="
 	intel-ucode
 	linux-asus-me176c
 	mesa-dri-classic
+	mesa-vulkan-intel
 	postmarketos-base
 	"
 makedepends="devicepkg-dev meson eudev-dev"
 source="https://github.com/me176c-dev/linux-me176c/archive/$_commit.tar.gz
 	deviceinfo
-	phoc.ini
-	"
-subpackages="
-	$pkgname-factory
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
-	$pkgname-vulkan
-	$pkgname-libva
+	rootston.ini
 	"
+subpackages="$pkgname-factory $pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
 builddir="$srcdir/linux-me176c-$_commit"

 build() {
@@ -61,24 +56,12 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
-}
-
-vulkan() {
-	install_if="$pkgname vulkan-loader"
-	depends="mesa-vulkan-intel"
-	mkdir "$subpkgdir"
-}
-
-libva() {
-	install_if="$pkgname libva"
-	depends="libva-intel-driver"
-	mkdir "$subpkgdir"
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 75243e3d0bc9a352465683ec8cf8b83566e4131bb7fae0f388267a62bdbf4691c955ed034b30df550f921b771080688123ae8db144b72f786bf1677ef1d83f57  3155254999ac36c3051a2118c415de25a072c0f6.tar.gz
-c8bb189b08035e647e07dec120a6e166d871c17a227987387228c8bf6ff264e029f950c69bb560d3062cee0e27e4fb93449523592558108690a82c6d40931de1  deviceinfo
-3823556d741a352fc7f43567d7218255a27c45c2c5d4d4bdf23f4d26ce2828c5a1c642519b84fef7f59756c990e6a199d72e6ba0c277939b08a40526c3ff3714  phoc.ini
+8dfeb1d928aa3ac94e9015d4b98713ec4d56eab68a7aee8cb7ce6a877b3d015670800bae456190ae57bcb35047738de5559460f2f7b785987f1394b605119ae5  deviceinfo
+a60d1785f0163d4a4eb63ea5e3017631aab7dd6683baad6a74b09809d33888d581ca8b14526c19d18234dcf727d1fdb4ff0489ed4bd5523905d0e4da7d93bc56  rootston.ini
 "
@@ -6,7 +6,7 @@ deviceinfo_name="ASUS MeMO Pad 7 (ME176C(X))"
 deviceinfo_codename="asus-me176c"
 deviceinfo_manufacturer="ASUS"
 deviceinfo_year="2014"
-deviceinfo_modules_initfs="goodix"
+deviceinfo_modules_initfs="vfat nls_cp437 nls_iso8859_1 nls_utf8 goodix"
 deviceinfo_arch="x86_64"

 # Device related
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1.75
@@ -1,9 +1,10 @@
 # Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Minecrell <minecrell@minecrell.net>
+# Maintainer: Jonathan Albrieux <jonathan.albrieux@gmail.com>
+# Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-bq-paella
 pkgdesc="BQ Aquaris X5"
 pkgver=6
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -38,5 +39,5 @@ nonfree_firmware() {
 }

 sha512sums="
-285087d1309c7bc6d4c11aaf4c89f754e5386cb53e1ab5ee6cfabe8fefa5ad95042d0b55fa12d2615df0bd82b668c6131435d8b770fa751ca5f6bd464e3bdecb  deviceinfo
+9b52a7db71484e614b3f8efc5b4450dcbe93165f8372b22006f4c84f62cd243785f262f29d892feeb6bd59c92df6a649511eb1f58be56a0f6f1384e8a7320392  deviceinfo
 "
@@ -8,7 +8,7 @@ deviceinfo_codename="bq-paella"
 deviceinfo_year="2015"
 deviceinfo_dtb="qcom/msm8916-longcheer-l8910"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="smb1360 panel-longcheer-yushun-nt35520 panel-longcheer-truly-otm1288a msm himax-hx852x"
+deviceinfo_modules_initfs="smb1360 panel-longcheer-yushun-nt35520 panel-longcheer-truly-otm1288a msm himax_852xES"
 deviceinfo_arch="aarch64"

 # Device related
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6000
 pkgdesc="Lenovo A6000"
-pkgver=6
-pkgrel=0
+pkgver=5
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo phoc.ini"
+source="deviceinfo rootston.ini"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -41,11 +41,11 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 c860b43edd7dcc2b10a7ee1dc8b2b7e225c469db6f7d45231b78e4e8a76bbe242b65e40488dcae2503ecdc407844eee50964db7b8d3a392a8f3f064afe690b99  deviceinfo
-10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
+cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1.8
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-lenovo-a6010
 pkgdesc="Lenovo A6010"
-pkgver=6
-pkgrel=0
+pkgver=5
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -12,7 +12,7 @@ options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
-source="deviceinfo phoc.ini"
+source="deviceinfo rootston.ini"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -41,11 +41,11 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 f5971257def301439b3786dada60333ad34b15b2221a296698cff7a0a8f7c5c6a54547c91bb024a883fe8f4f5f0b2926c044acc24e240ce1caeaf77697caad75  deviceinfo
-10d4ee62e5f7a9e4c368c460dd4c3ef282476e47d8cc40e4e3b83e971d04c493b801e5628ebdfe721f869e2fd68c521cf192cba1a973c8e03a61445534a28811  phoc.ini
+cd1402fcd7133c9364de8bd4e32f0d9e890f35d5d57fe92bd65736e23df1af428f091c9e5275fced111a6887ef562c46c5c19157b84a63955f8a1805b04d9951  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1.8
@@ -1,17 +1,19 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Sicelo <absicsz@gmail.com>
+# Co-Maintainer: Martijn Braam <martijn@brixit.nl>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
 pkgver=8
-pkgrel=4
+pkgrel=2
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-nokia-n900 u-boot-tools kbd kbd-bkeymaps ofono mesa-dri-gallium alsa-utils"
+depends="postmarketos-base linux-nokia-n900 u-boot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast alsa-utils"
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
 install="$pkgname.post-install"
 subpackages="
+	$pkgname-weston
 	$pkgname-x11
 	$pkgname-i3wm
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -32,6 +34,7 @@ source="
 	pointercal
 	asound.state.speakers
 	asound.state.headset
+	weston.ini
 	i3wm/scripts/battery-bq27200
 	i3wm/scripts/ofono
 	i3wm/scripts/calendar
@@ -111,6 +114,12 @@ package() {
 		"$pkgdir"/usr/share/bkeymaps/se/rx51_se.bmap.gz
 }

+weston() {
+	install_if="$pkgname weston"
+	install -Dm644 "$srcdir"/weston.ini \
+		"$subpkgdir"/etc/xdg/weston/weston.ini
+}
+
 x11() {
 	install_if="$pkgname xorg-server"
 	install -D -m644 "$srcdir"/40-xkb.conf \
@@ -164,6 +173,7 @@ dc585e11bf4e06e36c5c62bcc024eaacecc30437d9da5257df14be05e247a2f2bc208874be3058ed
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 67acc17a33bc75113300393b4a5bba15319014032407e774d079abf310368e75f4f697dbb4856ba2d2d8ea184b056bb33561f42918de3ee91ab6a77df89a133c  asound.state.speakers
 5b87071834313a389f83d29f86f6e3ea108d0921f17dc918be7a46de7e74c73a4418044ef600a0fbf72c8fad22b7730dcd5bfe3d6d01d76bf01556f8540f0b32  asound.state.headset
+7f48d1a044f8c02f7b1d11487ec1f83978d9b0ea12529156e7418f82be556d9baee32b70c4d911174e388bb4941dc19519e93e7551d00ffcd825c848665ff096  weston.ini
 2ae4771eda9b151de3b47dc4e3081eb86b92fc04c4be4b4fbb98c28016762d24008e935bbba8f95ea0732019f615ee43f5d93dacb21bdc3471e505a07a684e26  battery-bq27200
 82038d38f94cb975a8d38914afca49b64957446bef7490ab684efa1df47ede2ea1c769045789bb9fded673345eea01911fbbf85fdb54c28685cad8022bfaafac  ofono
 d9ef88c714e9fce8822f63b7a9d7fc3e1ed472c8c876b44ba524d44efea322839f13ddd2fa652420608427ecf7279bfaac302c9b67667f32796ca21da332164d  calendar
@@ -0,0 +1,8 @@
+[core]
+xwayland=true
+backend=fbdev-backend.so
+[Keyboard]
+keymap_rules=evdev
+keymap_model=nokiarx51
+[shell]
+background-image=/usr/share/wallpapers/postmarketos.jpg
@@ -3,8 +3,8 @@

 pkgname=device-odroid-hc2
 pkgdesc="ODROID HC2"
-pkgver=0.6
-pkgrel=0
+pkgver=0.4
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -40,8 +40,8 @@ package() {
 }

 nonfree_firmware() {
-	pkgdesc="U-Boot, Samsung JPEG encoder, and Realtek firmware, required for a bootable system"
-	depends="firmware-odroid-hc2 linux-firmware-rtl_nic linux-firmware-other"
+	pkgdesc="U-Boot and Realtek firmware, required for a bootable system"
+	depends="firmware-odroid-hc2 linux-firmware-rtl_nic"
 	mkdir "$subpkgdir"
 }

@@ -56,5 +56,5 @@ tools() {
 sha512sums="
 d02702884d47c2c6b98f1ec194fc3a11b2c6559d416c112d41ddecfbbd84f0706adfc72e13e9943f130e548d987aa7d151f4f416443d15b7dff2375d4d067144  deviceinfo
 06239b979ad78cadc1bc764b8c6a2ce57c7f2a44456ba918e83ea7ae2846c983ec6cb8eea708540e7c4f3abe2a1ff942b8c8ae5e6d68dbc65a8f5c34942af49e  uboot-script.cmd
-669a0561251f287f072c9c1fc37d89b49a47fc4a4e5134c9e6681750ae960e5827043166136b7d5b9ad52c931b060bdcb6d0b5335c2e9fdb4eefd82f131ded93  install-rootfs-hdd.sh
+8273be5a8c5a7b9a27ae91a1581ca2d247d0fb45e24e25e46ba8272955d7fce31c62562c3fae402f6a66918c9c61d838de692cca11eea3cdfde6a91f478f2955  install-rootfs-hdd.sh
 "
@@ -48,7 +48,7 @@ echo "Rootfs successfully copied!"

 # pmOS initfs looks for rootfs by label, rename partitions
 echo "Renaming partitions"
-e2label $MMC_ROOT_PARTITION old_rootfs
+e2label $MMC_ROOT_PARTITION pmOS_root_old
 e2label $HDD_ROOT_PARTITION pmOS_root

 echo "Rootfs moved to external HDD, you must reboot NOW!"
@@ -3,7 +3,7 @@

 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=7
+pkgver=4
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -16,14 +16,9 @@ depends="
 	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
 "
 makedepends="devicepkg-dev"
-source="
-	deviceinfo
-	phoc.ini
-	q6voiced.conf
-"
+source="deviceinfo rootston.ini"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"

 build() {
@@ -36,20 +31,17 @@ package() {

 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs"
 	mkdir "$subpkgdir"
-
-	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
-9b0603ceef02ec632ff333167b252743cc5461ae371b656a6468addf22d43ec10010d9348caebc9c21e2cdafb95af7bf6266ad405ac245779a325154d404bfde  deviceinfo
-65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
-7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
+009e1cfc0ae2823bb82dbc39a1b9c1199e0e7691f0e95a6423bbfe941e07486297e0aad295f2ea44d43ed51b1440bf8e6a67867d0c1a6aad653399afbd006c1d  deviceinfo
+9fef488a655fcbad4fb28c11d7d6cbe385096e766cd99ca59802f1dbc4e3c99dac0ff682549e02fac0b73f7e95db953f3a87c453d1b19b229785e4ffeec515ed  rootston.ini
 "
@@ -39,5 +39,5 @@ deviceinfo_flash_kernel_on_update="true"
 deviceinfo_rootfs_image_sector_size="4096"

 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_pmi8998_charger bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_fg qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"
@@ -1,2 +0,0 @@
-q6voice_card=0
-q6voice_device=3
@@ -1,4 +1,4 @@
-# /etc/phosh/phoc.ini
+# /etc/phosh/rootston.ini
 # Overwrites values set in /usr/share/phosh/phoc.ini

 [output:DSI-1]
@@ -3,7 +3,7 @@

 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=7
+pkgver=4
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
@@ -16,10 +16,9 @@ depends="
 	postmarketos-update-kernel
 	soc-qcom-sdm845
 	soc-qcom-sdm845-ucm
-	soc-qcom-sdm845-qbootctl
 "
 makedepends="devicepkg-dev"
-source="deviceinfo phoc.ini"
+source="deviceinfo rootston.ini"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"

 build() {
@@ -32,17 +31,17 @@ package() {

 nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs"
 	mkdir "$subpkgdir"
 }

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
-8561a33c0e7d5085186258a71d2fc44daa01b24d05781d53be87222b462059fee26baa2e004e799404606429629e56baad3778d74d1f725cec389f572c92155e  deviceinfo
-65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
+cd8b94751890fd8891e5eafbc4f668a068885d184ad9b93366c882cfafa798e4bc77fa548532796a278b5acdf15dbf1110a1a581823567deaa00b90a72796959  deviceinfo
+9fef488a655fcbad4fb28c11d7d6cbe385096e766cd99ca59802f1dbc4e3c99dac0ff682549e02fac0b73f7e95db953f3a87c453d1b19b229785e4ffeec515ed  rootston.ini
 "
@@ -39,5 +39,5 @@ deviceinfo_flash_kernel_on_update="true"
 deviceinfo_rootfs_image_sector_size="4096"

 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_pmi8998_charger bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_fg qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"
@@ -1,4 +1,4 @@
-# /etc/phosh/phoc.ini
+# /etc/phosh/rootston.ini
 # Overwrites values set in /usr/share/phosh/phoc.ini

 [output:DSI-1]
@@ -2,14 +2,14 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
-pkgver=10
-pkgrel=0
+pkgver=9
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	alsa-ucm-conf>=1.2.7
+	alsa-ucm-conf
 	linux-postmarketos-rockchip>=5.14
 	mesa-dri-gallium
 	nvme-cli
@@ -27,6 +27,8 @@ source="
 	70-edp-backlight.rules
 	mem_sleep.conf
 	nvme-powersave.initd
+	ucm/rockchip,es8316-codec.conf
+	ucm/HiFi
 	wlan-powersave-off.start
 "

@@ -47,6 +49,11 @@ package() {
 	install -D -m644 "$srcdir"/mem_sleep.conf \
 		"$pkgdir"/etc/sysfs.d/mem_sleep.conf

+	# Alsa usecase manager config
+	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card \
+		"$srcdir"/rockchip,es8316-codec.conf \
+		"$srcdir"/HiFi
+
 	install -D -m755 "$srcdir"/nvme-powersave.initd \
 		"$pkgdir"/etc/init.d/nvme-powersave

@@ -69,5 +76,7 @@ d3988fe83c54228d743f4a8c190e9530404a436a7fbc0b004bf20d3986b502d864717d8cc9c76812
 6e9e9ef54ee9aa9491be6dc30451fdcd9038b0efeb959509f48626d97a1696ee81711a46510049557b73269ff48acc85fad6496c65451e2e24908241b7655444  70-edp-backlight.rules
 bcae155e24a151d3c098833680b83b6004a329962f115480d560ebe19257eab87286b8a4c194e456c067ca54fb53e59a5a16b022cea13c11135b0855145db563  mem_sleep.conf
 2abfa31fa56028339efc6d2b6cb838f310990d7110ac4dd996bc4cfcf90f0a8770e70f28f77f7b6929d110e494bc33731302f16b9717729f991c2732be0731d5  nvme-powersave.initd
+71a3ea790eedd02df2bcf2ba24cc41b376ad0a8a7d72b1ee2dd7a0f9d618243d214157046649583f790b388d8faef5a03fcd4306ff4a3319e418bb895be831bc  rockchip,es8316-codec.conf
+558f08b56425e0ceeea8d4815eeb862a2b801ba1b26b4dc28f4d0ec991ed9dfef14113172a224191eb2de5d0b57a741e4c48f1307bda2a69595944bd58731be1  HiFi
 0fd7580e197e409978c219726af627cabe347404ee826e32892b61f3da1775b0fd81f8ed5e9a0f0bfaad87faa434d7a73ddaebf475ed0ad8fdcef6690cd692d3  wlan-powersave-off.start
 "
@@ -0,0 +1,61 @@
+SectionVerb {
+	EnableSequence [
+		cset "name='Headphone Playback Volume' 0"
+		cset "name='Headphone Mixer Volume' 100%"
+		cset "name='DAC Playback Volume' 100%"
+		cset "name='DAC Source Mux' LDATA TO LDAT, RDATA TO RDAC"
+		cset "name='Left Headphone Mixer Left DAC Switch' on"
+		cset "name='Left Headphone Mixer LLIN Switch' off"
+		cset "name='Right Headphone Mixer Right DAC Switch' on"
+		cset "name='Right Headphone Mixer RLIN Switch' off"
+	]
+	DisableSequence [
+	]
+
+	Value {
+		PlaybackPCM "hw:${CardId},0"
+		CapturePCM "hw:${CardId},0"
+	}
+}
+
+SectionDevice."Speaker" {
+	Comment "Internal speaker"
+	EnableSequence [
+		cset "name='Headphone Playback Volume' 0"
+		cset "name='Headphone Mixer Volume' 100%"
+		cset "name='Speaker Switch' on"
+	]
+	DisableSequence [
+		cset "name='Speaker Switch' off"
+	]
+	Value {
+		PlaybackVolume "DAC Playback Volume"
+		PlaybackSwitch "Speaker Switch"
+		PlaybackChannels 2
+		PlaybackPriority 300
+		PlaybackPCM "hw:${CardId},0"
+	}
+	ConflictingDevice [
+		"Headphones"
+	]
+}
+SectionDevice."Headphones" {
+	Comment "Headset"
+	EnableSequence [
+		cset "name='Headphone Playback Volume' 50%"
+		cset "name='Headphone Mixer Volume' 100%"
+		cset "name='Speaker Switch' off"
+	]
+	DisableSequence [
+	]
+	Value {
+		PlaybackVolume "DAC Playback Volume"
+		PlaybackChannels 2
+		PlaybackPriority 500
+		PlaybackPCM "hw:${CardId},0"
+		JackControl "Headphones Jack"
+	}
+	ConflictingDevice [
+		"Speaker"
+	]
+}
@@ -1,6 +1,6 @@
 Syntax 2

 SectionUseCase."HiFi" {
-	File "HiFi.conf"
+	File "/rockchip_es8316/HiFi"
 	Comment "Play high quality music"
 }
@@ -1,12 +0,0 @@
-SUBSYSTEMS=="usb", ENV{.LOCAL_ifNum}="$attr{bInterfaceNumber}"
-
-SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="01", SYMLINK+="EG25.NMEA", MODE="0660"
-SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", SYMLINK+="EG25.AT", MODE="0660"
-SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="03", SYMLINK+="EG25.MODEM", MODE="0660"
-
-ACTION=="add", SUBSYSTEM=="tty", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", RUN+="/usr/bin/pinephone_setup-modem '%E{DEVNAME}'"
-
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTRS{serial}=="0123456789ABCDEF", ATTR{power/persist}="1", ATTR{power/control}="on"
-
-ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ATTRS{serial}=="community_fw", ATTR{power/persist}="1", ATTR{power/control}="on"
-
@@ -1,123 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Martijn Braam <martijn@brixit.nl>
-pkgname=device-pine64-pinephonepro
-pkgdesc="PINE64 PinePhone Pro"
-pkgver=3.2
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-# pmb:strict is required for grub
-options="!check !archcheck pmb:strict"
-depends="
-	alsa-ucm-conf>=1.2.6.2
-	eg25-manager>=0.4.2
-	linux-pine64-pinephonepro
-	mesa-dri-gallium
-	postmarketos-base
-	fwupd
-	fwupd-plugin-modem_manager
-	fwupd-plugin-fastboot
-	"
-makedepends="
-	devicepkg-dev
-	grub
-	grub-efi
-	"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-install="
-	$pkgname.post-install
-	$pkgname.post-upgrade
-	"
-source="
-	90-modem-eg25.rules
-	deviceinfo
-	grub.cfg
-	grub_early.cfg
-	ucm/HiFi.conf
-	ucm/PINE64-PinePhonePro-.conf
-	ucm/VoiceCall.conf
-	ppkb.sh
-	setup-modem.sh
-	"
-
-build() {
-	devicepkg_build $startdir $pkgname
-
-	grub-mkimage \
-		--config="$srcdir/grub_early.cfg" \
-		--prefix="" \
-		--output="bootaa64.efi" \
-		--format="arm64-efi" \
-		--compression="xz" \
-		\
-		all_video \
-		cat \
-		configfile \
-		disk \
-		echo \
-		efi_gop \
-		fat \
-		gzio \
-		help \
-		iso9660 \
-		linux \
-		ls \
-		normal \
-		part_gpt \
-		part_msdos \
-		search \
-		search_label \
-		test \
-		true
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-
-	# Grub / bootloader
-	install -Dm644 -t "$pkgdir"/boot/grub \
-		"$srcdir"/grub.cfg
-	install -Dm644 -t "$pkgdir"/boot/EFI/Boot \
-		"$srcdir"/bootaa64.efi
-
-	# Alsa usecase manager config
-	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/PinePhonePro \
-		"$srcdir"/HiFi.conf \
-		"$srcdir"/PINE64-PinePhonePro-.conf \
-		"$srcdir"/VoiceCall.conf
-	mkdir -p "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card
-	ln -s /usr/share/alsa/ucm2/PinePhonePro/PINE64-PinePhonePro-.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card/PINE64-PinePhonePro-.conf
-
-	# Modem
-	install -Dm755 "$srcdir"/setup-modem.sh \
-		"$pkgdir"/usr/bin/pinephone_setup-modem
-	install -Dm644 "$srcdir"/90-modem-eg25.rules -t \
-		"$pkgdir"/usr/lib/udev/rules.d/
-
-	# Keyboard config
-	install -Dm755 "$srcdir"/ppkb.sh "$pkgdir"/etc/profile.d/ppkb.sh
-}
-
-nonfree_firmware() {
-	pkgdesc="Wifi, Bluetooth and video-out firmware"
-	depends="
-		firmware-pine64-pinebookpro
-		linux-firmware-brcm
-		linux-firmware-rockchip
-		"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-fdfa807c0de33aee3deb09ee25c37a58fa970ce71483e52f21793717cb89adeb74f251ff1a2c2086361e3e58877f8b2e5643f24186b1a537acf9c16e3419313c  90-modem-eg25.rules
-e591572d0bfc4d7d990fcc15bc82e78e60404becf62a38283b4ceee6f49a812b63eebbc5c304907330e33dce5f023edba26c9b86f1375affa3cf6b49fbd06539  deviceinfo
-eeddbd3712c7385ef8daea252d71f9f91f8be03be43dea4ce036ae7d7b8a38d199a709ae87b9aa8fe8a63f0201224dbda704fd4b95c8c7d3b4f9852ae4e95c11  grub.cfg
-0f9357d4eea089628fbceb1e3e96d21a3f4329aeb6743158a6f877f967ef274506404eba949d5f01b7e1adea149f9a3aef992a5e8cd4181f93ab00909b1c5ecd  grub_early.cfg
-1684514a6b814a83473e9da8855fd776cf3f31a2be1f8834c370f710428b4ee305559e275be52894d167ccd1e32f8f1c8586f8a072f19e44b46caec9f504d453  HiFi.conf
-9c6edbe7ea387baf9bfa6c4a46b28c4fe274ab0994e0a1640012048407e6679c437de43cc50e6778c9a852132eaa680de3fd4e0256d36455d1dd57aa729ac8be  PINE64-PinePhonePro-.conf
-deb360baf914e1c917403d5e26291b9e9d27426876232ab753e4ebfe367423206f1fc01b85d195aa69fb4b51bcaed023423d0fcc0d73fa1bedd5fbe7b17f0fb5  VoiceCall.conf
-43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
-420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515  setup-modem.sh
-"
@@ -1,6 +0,0 @@
-timeout=0
-
-menuentry "postmarketOS" {
-	linux ($root)/vmlinuz console=tty0 earlycon=uart8250,mmio32,0xff1a0000 console=ttyS2,115200 panic=10 coherent_pool=1M loglevel=1 mem_sleep_default=s2idle PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE fw_devlink=off
-	initrd ($root)/initramfs
-}
@@ -1,2 +0,0 @@
-search --no-floppy --set=root --label "pmOS_boot"
-set prefix=($root)/grub
@@ -1,2 +0,0 @@
-#!/bin/sh
-export XKB_DEFAULT_MODEL=ppkb
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-log() {
-	echo "$@" | logger -t "postmarketOS:modem-setup"
-}
-
-QMBNCFG_CONFIG="1"
-
-if [ -z "$1" ]
-then
-	DEV="/dev/EG25.AT"
-else
-	DEV="$1"
-fi
-
-# Read current config
-QMBNCFG_ACTUAL_CONFIG=$(echo 'AT+QMBNCFG="AutoSel"' | atinout - $DEV -)
-
-if echo $QMBNCFG_ACTUAL_CONFIG | grep -q $QMBNCFG_CONFIG
-then
-	log "Modem already configured"
-	exit 0
-fi
-
-
-# Configure VoLTE auto selecting profile
-RET=$(echo "AT+QMBNCFG=\"AutoSel\",$QMBNCFG_CONFIG" | atinout - $DEV -)
-if ! echo $RET | grep -q OK
-then
-	log "Failed to enable VoLTE profile auto selecting: $RET"
-	exit 1
-fi
@@ -3,7 +3,7 @@
 # Co-Maintainer: Dylan Van Assche <me@dylanvanassche.be>
 pkgname=device-pine64-pinetab
 pkgdesc="PINE64 PineTab"
-pkgver=0.13
+pkgver=0.12
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
@@ -34,7 +34,7 @@ source="
 	deviceinfo
 	gsk-renderer-gl.sh
 	kirigami-lowpower.sh
-	phoc.ini
+	rootston.ini
 	sway.conf
 	uboot-script.cmd
 	ucm/HiFi.conf
@@ -112,20 +112,17 @@ weston() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 package() {
 	devicepkg_package $startdir $pkgname

 	# Alsa usecase manager config
-	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/PineTab \
-		"$srcdir"/HiFi.conf \
-		"$srcdir"/PineTab.conf
-	mkdir -p "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card
-	ln -s /usr/share/alsa/ucm2/PineTab/PineTab.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card/PineTab.conf
+	install -Dm644 -t "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card \
+		"$srcdir"/PineTab.conf \
+		"$srcdir"/HiFi.conf

 	# Pulseaudio config
 	install -Dm644 "$srcdir"/pulse-pinetab.conf \
@@ -165,7 +162,7 @@ sha512sums="
 6274b664ad42456ff51ec4ec2dea9749bff59e0eee0c2d1f7e8950934ee92e410e554df246f81bd01813ddfae5e6a9001a8fcad05815beab536d1547251d5aeb  deviceinfo
 9244687bfea20c78120f7c48388d141eff3e23a421e48504eac1479ec7f51197d9ca72468c9cc33c6e3d3fa32ee3514711545816e607d49870226e4a41a60a85  gsk-renderer-gl.sh
 6bc22b369b2d9058b702ac7a7862abaefaf8179b43491868bdb008d181b59104f1ded89db1da51a810e1ccdc803a579b924a438674283a65afc3a9c4d2894caf  kirigami-lowpower.sh
-5c683f2cf27b2f982c8581251688834634957143334011861400d3eed27b6590f37055fe61c8af632552435dba581fa990a44c1e5689a3c8fe642fd095b740ce  phoc.ini
+38827d9636c48b133eb333764a6799a6e93454e01ecb0cfde1ecad3ee149606ba59eb1a5e6c8366e3b3891e54bd664a0a5acdd89d38ac3a3551260e9b9a6d3fc  rootston.ini
 9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2  sway.conf
 181438ed8723c29bf201a5d4ad1ae588afcd03763deadb267b23d96ad40c8956e08b2e3b800f4ee5d77774625d0b0e6a70c4068f98fbfad50d31e71b30a24164  uboot-script.cmd
 a2fd8037c9a1af000f31c7005436d791525317f818c553d1e2f472b4df76c71d769ecbf67b369a478bea720a6215eaa9fb6a26ba218ac9410513e2345ebe7b4c  HiFi.conf
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1
@@ -4,18 +4,18 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-a3
 pkgdesc="Samsung Galaxy A3 (2015)"
-pkgver=11
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
-	 soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround"
+	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="
 	deviceinfo
-	phoc.ini
+	rootston.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -51,11 +51,11 @@ phosh() {
 	for pkg in $_substitutes; do replaces="$replaces $pkg-phosh"; done
 	for pkg in $replaces; do provides="$provides $pkg=$pkgver-r$pkgrel"; done
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 dac014f2ebc1c461e43917fcfc020675c10ac39e17b83b0e0e2246b159db1f61ce024df21624f2635729f29521b30b4cce29b4451931cb27cf4d0f34b19ec509  deviceinfo
-e8f734a2f8d154813dbb493f0d58af50a7f624ffed41967a81493b975a6211efc6d30743b23825562cfd126791cbdd3348bfbed32eeece9b8acec0a37c3c51b6  phoc.ini
+f3667b914bb955be9e97db31dc7ed4a7c5d0c369be9549d587bb7208e270590c0c3fa36a0dd997d6f8305c5c9afb3b906423af6ca8724e806f995e61226cfc83  rootston.ini
 "
@@ -1,5 +0,0 @@
-[cursor:seat0]
-map-to-output = DSI-1
-
-[output:DSI-1]
-scale = 1
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1
@@ -3,14 +3,14 @@
 # Co-Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-samsung-a5
 pkgdesc="Samsung Galaxy A5 (2015)"
-pkgver=10
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
-	 soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround"
+	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="
@@ -1,41 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Raymond Hackley <raymondhackley@protonmail.com>
-pkgname=device-samsung-e7
-pkgdesc="Samsung Galaxy E7"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	postmarketos-base
-	mkbootimg
-	linux-postmarketos-qcom-msm8916
-	soc-qcom-msm8916
-	soc-qcom-msm8916-rproc
-"
-makedepends="devicepkg-dev"
-source="deviceinfo"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
-_pmb_select="soc-qcom-msm8916-rproc"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="GPU/WiFi/BT/Modem/Video firmware"
-	depends="firmware-qcom-adreno-a300 msm-firmware-loader firmware-samsung-e7-wcnss-nv"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-75fb5dda5b4b0444ec06c6ac86b946428932935f321b3e5ed18b5b053639923b2aadf95d5c2319778d1afc6b2ce107fc8abdce854050ce121625cc93211c6e96  deviceinfo
-"
@@ -1,33 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Samsung Galaxy E7"
-deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-e7"
-deviceinfo_year="2015"
-deviceinfo_dtb="qcom-msm8916-samsung-e7"
-deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="panel-samsung-ea8061-ams549bu19-id400418 msm stmfts"
-deviceinfo_arch="armv7"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_screen_width="720"
-deviceinfo_screen_height="1280"
-deviceinfo_getty="ttyMSM0;115200"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
-deviceinfo_generate_bootimg="true"
-deviceinfo_flash_offset_base="0x80000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x02000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x01e00000"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_flash_sparse="true"
@@ -4,15 +4,15 @@
 pkgname=device-samsung-espresso3g
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
 pkgver=3
-pkgrel=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base postmarketos-update-kernel linux-samsung-espresso3g mesa-dri-gallium mkbootimg"
+depends="postmarketos-base postmarketos-update-kernel linux-samsung-espresso3g mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo xorg.conf"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-userland:nonfree_userland"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,6 +28,28 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

+nonfree_userland() {
+	# Patched wlroots is also necessary for accelerated phosh and sway.
+	# See https://gitlab.com/antoni.aloytorrens/p-wlroots and https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2573.
+	# Unfortunately, such workarounds are not accepted in pmOS.
+	pkgdesc="$pkgdesc (GPU userspace libraries)"
+	depends="mesa-pvr-dri-classic sgx-ddk-um sgx-ddk-um-openrc sgx-ddk-um-ti443x"
+	mkdir "$subpkgdir"
+}
+
+phosh() {
+	install_if="$pkgname postmarketos-ui-phosh"
+	install -Dm644 "$srcdir"/rootston.ini \
+			"$subpkgdir"/usr/share/phosh/phoc.ini
+}
+
+x11() {
+	install_if="$pkgname xorg-server"
+	install -Dm644 "$srcdir"/xorg.conf \
+		"$subpkgdir"/etc/X11/xorg.conf.d/99-modesetting.conf
+}
+
 sha512sums="
-dbf180ad55042899074ea71d2c50754f2b8c9a12becdffc8fd52794b36c5c5ee2038e5074be66cbc53068d2ac7abae5b22ae3585b17caf9e179101c9101f6d57  deviceinfo
+41897ea67a1773023269a37aab57dc6a60e6804319ae329ce355cac464809c16699262dca1f4b1895b01e9e20bfc640ce3577ac0703a33ba2201555e4d0f28f9  deviceinfo
+41f0d61da6f5029be51396fdcdc91aa241c47825adc32cc03f81d1c2ada633f1e293a03dd3ed75a7e8c3e2d960aec889ecdb3af7db5f106444c06f4f6c45debd  xorg.conf
 "
@@ -17,7 +17,7 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1024"
 deviceinfo_screen_height="600"
-deviceinfo_gpu_accelerated="false"
+deviceinfo_gpu_accelerated="true"

 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -0,0 +1,12 @@
+Section "Device"
+  Identifier "DSI-1"
+  Driver "modesetting"
+  Option "kmsdev" "/dev/dri/by-path/platform-omapdrm.0-card"
+  Option "AccelMethod" "none"
+  Option "Atomic" "on"
+  Option "VariableRefresh" "on"
+EndSection
+
+Section "ServerFlags"
+  Option "AutoAddGPU" "false"
+EndSection
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt510
 pkgdesc="Samsung Galaxy Tab A 9.7 (2015)"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,7 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	pointercal
-	phoc.ini
+	rootston.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -45,12 +45,12 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 5acddf5145a0ec2cbe056bd120b1413fd6efee441f15127ce6f132ab470f326ba729f71afc70ba4d8dc9dab62e49fa20217632f08f9ed6d5b2ddda033ed32009  deviceinfo
 6aedd5eeac4d21356678f5399f3f0946392c9a7477ac21d39b8e761133dc8ed67adb4966647314f71d5263483ab68cad92847dacff95ffa45eabfc33c9f405b5  pointercal
-ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
+bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1
@@ -2,8 +2,8 @@
 # Maintainer: Nikita Travkin <nikita@trvn.ru>
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
-pkgver=4
-pkgrel=0
+pkgver=3
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -13,7 +13,7 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 makedepends="devicepkg-dev dtbtool"
 source="
 	deviceinfo
-	phoc.ini
+	rootston.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -41,11 +41,11 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
 b374fc9b75b0693a27c94116f652410a0b026077beba91527104fd0e3e720ddec0c1e48b54714af810b514571d5f2021f8facf34a9ea8de35b92aa060af64d19  deviceinfo
-ed612b090c1ee512fc257368082fe0c88ca6c98a9d673ece68593739c7a41b4f9dca5d9360de6f84d206f297feba480a9f1982301132e08a14a5ff920a2675a6  phoc.ini
+bc620d2031027405f70eea68854744799b460db0d787e2c844556f437120eea0fc857689c6894dd485a5cd3794c7fb5281b901e9e10da1b550c637a852445180  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1
@@ -1,60 +0,0 @@
-# Reference: <https://postmarketos.org/devicepkg>
-# Maintainer: Newbyte <newbyte@disroot.org>
-pkgname=device-samsung-m0
-pkgdesc="Samsung Galaxy S III"
-pkgver=6.2
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="
-	alsa-ucm-conf
-	linux-postmarketos-exynos4
-	mesa-dri-gallium
-	mkbootimg
-	postmarketos-base
-	postmarketos-update-kernel
-	soc-samsung-exynos4412-haptics
-	"
-makedepends="devicepkg-dev"
-install="$pkgname.post-install"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="
-	deviceinfo
-	ucm/Midas.conf
-	ucm/HiFi.conf
-	modules-load.conf
-	"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-
-	_midas_audio_dir="$pkgdir/usr/share/alsa/ucm2/conf.d/Midas"
-
-	# Alsa UCM configs
-	install -Dm644 "$srcdir"/Midas.conf \
-		-t "$_midas_audio_dir"
-	install -Dm644 "$srcdir"/HiFi.conf \
-		-t "$_midas_audio_dir"
-}
-
-nonfree_firmware() {
-	pkgdesc="WiFi and Bluetooth firmware"
-	depends="
-		firmware-samsung-midas-bluetooth
-		firmware-samsung-midas-wifi
-		"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-042a7d64ea9dd6d9f31e3754fc873e98ab403f8bfa2a7ec13c849db5282a1a23745936d7e2fc64c09a2cdb140acd903948298f39c5cb8c03130411ac94e9d34d  deviceinfo
-caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc  Midas.conf
-21f64c9104ec5780fffde8ba7ce57583592469694d07dd5e2de4173d7c9f99ba57fb28bb5bcfbbce921be9c4ead9d31980e948533162fe12424c2037145debb1  HiFi.conf
-56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051  modules-load.conf
-"
@@ -1,5 +0,0 @@
-# This file contains the names of kernel modules that should be loaded
-# at boot time, one per line. Lines beginning with "#" are ignored.
-
-# notification led module
-ledtrig-pattern
@@ -1,238 +0,0 @@
-# Based on https://github.com/Midas-Mainline/android_device_midas_common/blob/lineage-18.1/configs/audio.i9300.xml
-
-SectionVerb {
-
-	EnableSequence [
-
-		cdev "hw:Midas"
-
-		# do not change the adc & dac source of AIF2
-		cset "name='AIF2DACL Source' 0"
-		cset "name='AIF2DACR Source' 0"
-		cset "name='AIF2ADCL Source' 0"
-		cset "name='AIF2ADCR Source' 1"
-
-		# AIF1->DAC1
-		cset "name='DAC1 Switch' 1"
-
-		# general
-		cset "name='IN1L ZC Switch' 0"
-		cset "name='IN1R ZC Switch' 0"
-		cset "name='IN2L ZC Switch' 0"
-		cset "name='IN2R ZC Switch' 0"
-		cset "name='Output ZC Switch' 0"
-		cset "name='Speaker ZC Switch' 0"
-		cset "name='Headphone ZC Switch' 0"
-
-		# AIF1->DAC1
-		cset "name='DAC1L Mixer AIF1.1 Switch' 1"
-		cset "name='DAC1R Mixer AIF1.1 Switch' 1"
-		cset "name='DAC1 Switch' 1"
-
-		# ADC->AIF2
-		cset "name='AIF2DAC2L Mixer Left Sidetone Switch' 1"
-		cset "name='AIF2DAC2L Mixer Right Sidetone Switch' 0"
-		cset "name='AIF2DAC2R Mixer Left Sidetone Switch' 0"
-		cset "name='AIF2DAC2R Mixer Right Sidetone Switch' 1"
-		cset "name='DAC2 Left Sidetone Volume' 12"
-		cset "name='DAC2 Right Sidetone Volume' 12"
-		cset "name='DAC2 Switch' 1"
-
-		# DAC1->HP
-		cset "name='Left Headphone Mux' Mixer"
-		cset "name='Right Headphone Mux' Mixer"
-
-		# DAC1->SPKL/R->SPKL/R Boost->SPK
-		cset "name='SPKL DAC1 Switch' 1"
-		cset "name='SPKR DAC1 Switch' 1"
-		cset "name='SPKL Boost SPKL Switch' 1"
-		cset "name='SPKL Boost SPKR Switch' 1"
-		cset "name='SPKR Boost SPKL Switch' 0"
-		cset "name='SPKR Boost SPKR Switch' 0"
-		cset "name='Speaker Mixer Volume' 3"
-
-		# DAC->Output mixer->Earpiece
-		cset "name='Left Output Mixer DAC Switch' 1"
-		cset "name='Right Output Mixer DAC Switch' 1"
-		cset "name='Earpiece Mixer Left Output Switch' 1"
-		cset "name='Earpiece Mixer Right Output Switch' 1"
-		cset "name='Earpiece Switch' 1"
-
-		# LINEOUT
-		cset "name='LINEOUT2N Mixer Left Output Switch' 1"
-		cset "name='LINEOUT2P Mixer Right Output Switch' 1"
-		cset "name='LINEOUT1N Mixer Right Output Switch' 1"
-		cset "name='LINEOUT1P Mixer Left Output Switch' 1"
-
-		# Input mixer->ADC->AIF1.1
-		cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 1"
-		cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 1"
-
-		# Main Mic->IN1LP/N->Input Mixer with +30dB at mixer
-		cset "name='IN1L PGA IN1LP Switch' 1"
-		cset "name='IN1L PGA IN1LN Switch' 1"
-		cset "name='MIXINL IN1L Volume' 1"
-		cset "name='IN1L Switch' 1"
-
-		# Sub Mic->IN1RP/N->Input Mixer with +30dB at mixer
-		cset "name='IN1R PGA IN1RP Switch' 1"
-		cset "name='IN1R PGA IN1RN Switch' 1"
-		cset "name='MIXINR IN1R Volume' 1"
-		cset "name='IN1R Switch' 1"
-
-		# FM Radio->IN2RP/N->Input Mixer with +30dB at mixer
-		cset "name='IN2R PGA IN2RP Switch' 1"
-		cset "name='IN2R PGA IN2RN Switch' 1"
-		cset "name='MIXINR IN2R Volume' 1"
-		cset "name='IN2R Switch' 1"
-
-		# Ear Mic->IN2LP/N->Input Mixer with +30dB at mixer
-		cset "name='IN2L PGA IN2LP Switch' 1"
-		cset "name='IN2L PGA IN2LN Switch' 1"
-		cset "name='MIXINL IN2L Volume' 1"
-		cset "name='IN2L Switch' 1"
-
-		# Input mixer->ADC->AIF1
-		cset "name='AIF1ADC1L Mixer ADC/DMIC Switch' 1"
-		cset "name='AIF1ADC1R Mixer ADC/DMIC Switch' 1"
-		cset "name='ADCL Mux' ADC"
-
-		# HPF on to take out some bounce
-		cset "name='Sidetone HPF Switch' 0"
-
-		# Work around core issue
-		cset "name='ADCL Mux' DMIC"
-		cset "name='ADCL Mux' ADC"
-		cset "name='ADCR Mux' DMIC"
-		cset "name='ADCR Mux' ADC"
-
-		# AIF2ADCDAT to AIF3ADC mux
-		cset "name='AIF3ADC Mux' 1"
-
-		# Default all outputs off
-		cset "name='HP Switch' 0"
-		cset "name='SPK Switch' 0"
-		cset "name='RCV Switch' 0"
-		cset "name='LINE Switch' 0"
-		cset "name='HDMI Switch' 0"
-
-		# Default all inputs off
-		cset "name='Main Mic Switch' 0"
-		cset "name='Sub Mic Switch' 0"
-		cset "name='Headset Mic Switch' 0"
-		cset "name='FM In Switch' 0"
-
-		# EQ Switches
-		cset "name='AIF1DAC1 EQ Switch' 1"
-		cset "name='AIF1DAC1 EQ1 Volume' 9"
-		cset "name='AIF1DAC1 EQ2 Volume' 7"
-		cset "name='AIF1DAC1 EQ3 Volume' 10"
-		cset "name='AIF1DAC1 EQ4 Volume' 13"
-		cset "name='AIF1DAC1 EQ5 Volume' 12"
-
-		cset "name='Headphone Volume' 50"
-		cset "name='AIF1DAC1 Volume' 96"
-		cset "name='AIF1 Boost Volume' 0"
-		cset "name='DAC1 Volume' 96"
-		cset "name='Left Output Mixer DAC Volume' 7"
-		cset "name='Right Output Mixer DAC Volume' 7"
-	]
-
-	DisableSequence [
-	]
-}
-
-SectionDevice."Speaker" {
-
-	Comment "Built-in speaker"
-
-	EnableSequence [
-		cset "name='SPK Switch' 1"
-		cset "name='AIF1DAC1 Volume' 96"
-		cset "name='AIF1 Boost Volume' 0"
-		cset "name='DAC1 Volume' 96"
-		cset "name='Left Output Mixer DAC Volume' 7"
-		cset "name='Right Output Mixer DAC Volume' 7"
-		cset "name='SPKL DAC1 Volume' 1"
-		cset "name='SPKR DAC1 Volume' 1"
-		cset "name='Speaker Mixer Volume' 3"
-		cset "name='Speaker Boost Volume' 4"
-		cset "name='Speaker Volume' 57"
-	]
-
-	DisableSequence [
-		cset "name='SPK Switch' 0"
-		cset "name='Speaker Mixer Volume' 1"
-		cset "name='Speaker Volume' 0"
-	]
-
-	Value {
-		PlaybackVolume "Speaker Volume"
-		PlaybackSwitch "SPK Switch"
-		PlaybackChannels 2
-		PlaybackPCM "hw:${CardId}"
-	}
-}
-
-SectionDevice."Mic1" {
-	Comment "Back Internal Microphone"
-
-	EnableSequence [
-		cset "name='Sub Mic Switch' 1"
-		cset "name='IN1R Volume' 22"
-		cset "name='MIXINR IN1R Switch' 1"
-		cset "name='MIXINR IN1R Volume' 1"
-		cset "name='AIF1ADCR Source' 1"
-		cset "name='AIF2ADCR Source' 1"
-		cset "name='AIF1ADC1 HPF Mode' 1"
-		cset "name='AIF1ADC1 HPF Switch' 1"
-		cset "name='AIF1ADC1 Volume' 96"
-	]
-
-	DisableSequence [
-		cset "name='Sub Mic Switch' 0"
-		cset "name='MIXINR IN1R Switch' 0"
-		cset "name='IN1R Volume' 10"
-	]
-
-	Value {
-		CapturePCM "hw:${CardId}"
-		CaptureChannels 2
-		CaptureVolume "IN1R Volume"
-	}
-}
-
-SectionDevice."Headset" {
-	Comment "Headset Input"
-
-	EnableSequence [
-		cset "name='MIXINL IN1L Switch' 0"
-		cset "name='MIXINR IN1R Switch' 0"
-		cset "name='Headset Mic Switch' 1"
-		cset "name='IN2L Volume' 22"
-		cset "name='MIXINL IN2L Switch' 1"
-		cset "name='MIXINL IN2L Volume' 1"
-		cset "name='AIF1ADC1 HPF Mode' 1"
-		cset "name='AIF1ADC1 HPF Switch' 1"
-		cset "name='AIF1ADC1 Volume' 96"
-		cset "name='AIF1ADCL Source' 0"
-		cset "name='AIF1ADCR Source' 0"
-		cset "name='AIF2ADCL Source' 0"
-	]
-
-	DisableSequence [
-		cset "name='Headset Mic Switch' 0"
-		cset "name='IN2L Volume' 10"
-		cset "name='MIXINL IN2L Switch' 0"
-		cset "name='MIXINL IN2L Volume' 0"
-		cset "name='AIF1ADC1 HPF Mode' 0"
-		cset "name='AIF1ADC1 HPF Switch' 0"
-		cset "name='AIF1ADC1 Volume' 96"
-	]
-
-	Value {
-		CapturePCM "hw:${CardId}"
-		CaptureChannels 2
-		CaptureVolume "IN2L Volume"
-	}
-}
@@ -1,3 +1,3 @@
-# Tag wwan ports of some Samsung devices to reduce the facility
+# Tag wwan ports of device samsung-serranove to reduce the facility
 # lock query by ModemManager, avoiding a QMI protocol error.
 SUBSYSTEM=="wwan", ENV{ID_MM_QMI_FACILITY_LOCK_QUERY_REDUCED}="1"
@@ -2,18 +2,19 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-samsung-serranove
 pkgdesc="Samsung Galaxy S4 Mini Value Edition"
-pkgver=12
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
-	 soc-qcom-msm8916 soc-qcom-msm8916-rproc soc-samsung-msm8916-modem-workaround"
+	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="
+	77-modem-samsung-serranove.rules
 	deviceinfo
-	phoc.ini
+	rootston.ini
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -33,6 +34,8 @@ build() {

 package() {
 	devicepkg_package $startdir $pkgname
+	install -Dm644 "$srcdir"/77-modem-samsung-serranove.rules \
+		"$pkgdir"/lib/udev/rules.d/77-modem-samsung-serranove.rules
 }

 nonfree_firmware() {
@@ -47,11 +50,12 @@ phosh() {
 	replaces="$_substitutes-phosh"
 	provides="$replaces=$pkgver-r$pkgrel"
 	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
+4b747284acf73a401255093dfd7b6406fa8e3428307f031d39b1631d1a3ae6404789fc2dfff0cf2da6b2f0757071363cc70b4ef7d445c7b3c047b6feb88b9125  77-modem-samsung-serranove.rules
 d666cf805d292d13d9e15a350b203580f016f455dad16cbc4a94471edb145fd464c5ad92a50077995234a9db1322e605e0294a6c5d7342fa6675b1bfec4eb69e  deviceinfo
-1bc90a1a67309b43435039332b2a1d7e606408c6429b3cb8991a57f53dd4de36fbe471481b6481fbdb098c3819344e8093dd8eab0d34eb3c091ab6d8abd5c087  phoc.ini
+94c866b6583faadc4a96a4d737983ba7838ede52afa5e29e261ef0ad0f2afe29fd3b793c9208ae74c7d48db6b991ad21800b9e457fbba4c69ce9dec2cda268ea  rootston.ini
 "
@@ -1,5 +1,5 @@
 [cursor:seat0]
-map-to-output = DSI-1
+map-to-output:DSI-1

 [output:DSI-1]
 scale = 1.5
@@ -4,8 +4,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=7
-pkgrel=0
+pkgver=4
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -27,8 +27,7 @@ subpackages="

 source="
 	deviceinfo
-	phoc.ini
-	q6voiced.conf
+	rootston.ini
 "

 build() {
@@ -41,10 +40,8 @@ package() {

 nonfree_firmware() {
 	pkgdesc="GPU, venus, modem firmware"
-	depends="firmware-xiaomi-beryllium soc-qcom-sdm845-nonfree-firmware"
+	depends="firmware-xiaomi-beryllium"
 	mkdir "$subpkgdir"
-
-	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

 kernel_tianma() {
@@ -61,12 +58,11 @@ kernel_ebbg() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }

 sha512sums="
-399e430a7340755c39680e436141dc141b38669791664bfb6d902bf4994516305fdf3e0e088717f60dc24faf64e0993c8695572f1afb7875a46548f494fdb54d  deviceinfo
-e2e417169345c86a5dd34ac0afac4b2b983a755f4c7ba5698c385a01f96b9bd2c3ace1ce5a0569c121675e8b87e88e1cf5c648e995d9c50cba66e52bbc83753c  phoc.ini
-7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
+29090e3d3fc16a752b33910abcfd8719af34bd257a7ca3cf25e9f1afc49e20582a7505bd7cd2ea2eb274c834eead277f31e5fb9384de8b444500518275e5a711  deviceinfo
+eb0cc845431cabdc81c518ac51af761864ed4d51b52842361850bb795582c3be48ecd041f543b08158a36fea12800b263b87cbe6393663c1b315f496504e6a5b  rootston.ini
 "
@@ -37,5 +37,5 @@ deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"

 # osk-sdl
-deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni qcom_pmi8998_charger qcom_fg nt36xxx"
-deviceinfo_modules_initfs_ebbg="gpi i2c_qcom_geni qcom_pmi8998_charger qcom_fg focaltech_fts"
+deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni nt36xxx"
+deviceinfo_modules_initfs_ebbg="gpi i2c_qcom_geni focaltech_ft8719"
@@ -1,2 +0,0 @@
-q6voice_card=0
-q6voice_device=3
@@ -1,4 +1,4 @@
-# /etc/phosh/phoc.ini
+# /etc/phosh/rootston.ini
 # Overwrites values set in /usr/share/phosh/phoc.ini

 [output:DSI-1]
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=4
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -22,11 +22,10 @@ makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"

 source="
-	30-gpu-firmware.files
 	deviceinfo
-	gpu-nobin.sh
 	pointercal
-	phoc.ini
+	rootston.ini
+	30-gpu-firmware.files
 	"

 build() {
@@ -38,9 +37,6 @@ package() {

 	install -D -m644 "$srcdir"/pointercal \
 		"$pkgdir"/etc/pointercal
-
-	install -D -m644 "$srcdir"/gpu-nobin.sh \
-		"$pkgdir"/etc/profile.d/gpu-nobin.sh
 }

 nonfree_firmware() {
@@ -60,15 +56,14 @@ nonfree_firmware() {

 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
 }


 sha512sums="
-a1ca623314e80045ea8d64be06d12ffc091a5585ca40f9713039883e20889ba47f4a3f9c3bd92bd3b616bb6bb621e87409b6b6fa43bfe566a2a46468609c16f4  30-gpu-firmware.files
-52ba13a75f14c8d75a719f463a870df34eb59765bd43f29a49fb0dff201410fa388a04f73ec8e6e86d634547bf6ef0164466333b24da36d882b0d7254bfbe213  deviceinfo
-ecd40b8f9bc17f383c52aa96ad23ceec41be75a4500d5e7a67f2f59875bf9f72eb35686a0b6e4949b45fd589c5da409d1212c52172fef94de2d1655b28c339b4  gpu-nobin.sh
+f0f2f6598947e8261607f259bb869e2845b08a5c1df28126bc705f8e7a11547e5702395741da5a7f50a41e17e6840b9ef01a4e3248b387b4d00510aef54118ee  deviceinfo
 e9ee9c1404b41ba15eafff3f728ff6e0e78dc17e9a88483fca92db1aa3efe0e4d5bf26142e533c4ff12b1bf8ce04ccabb7ca0f93aaea586d5b30910282aad237  pointercal
-38409d4ce48db4624539dbfd695d3c6e1596a29fd7c3004a41368b28cba646495d05360420ad728f82c63d6ddeeca71d09944df06ebaca120aedd9cc2b436eb3  phoc.ini
+035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini
+a1ca623314e80045ea8d64be06d12ffc091a5585ca40f9713039883e20889ba47f4a3f9c3bd92bd3b616bb6bb621e87409b6b6fa43bfe566a2a46468609c16f4  30-gpu-firmware.files
 "
@@ -6,7 +6,7 @@ deviceinfo_name="Xiaomi Mi Note 2"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-scorpio"
 deviceinfo_year="2016"
-deviceinfo_dtb="qcom/msm8996pro-xiaomi-scorpio"
+deviceinfo_dtb="qcom/msm8996-xiaomi-scorpio"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs="atmel_mxt_ts msm panel-lgphilips-sw43101 qcom_fg"
 deviceinfo_arch="aarch64"
@@ -1,2 +0,0 @@
-export FD_MESA_DEBUG=nobin
-
@@ -1,4 +1,4 @@
-# /etc/phosh/phoc.ini
+# /etc/phosh/rootston.ini
 # Overwrites values set in /usr/share/phosh/phoc.ini

 [output:DSI-1]
@@ -1,14 +1,14 @@
 # Maintainer: Caleb Connolly <caleb@connolly.tech>

 pkgname=firmware-oneplus-sdm845
-pkgver=6
+pkgver=5
 pkgrel=0
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
-depends="linux-firmware-qcom linux-firmware-ath10k"
+depends="soc-qcom-sdm845-nonfree-firmware linux-firmware-qcom linux-firmware-ath10k"
 license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
+options="!check !strip !archcheck !tracedeps"

 _version="3ec855b2247291c79652b319dfe93f7747363c86"

@@ -1,5 +1,5 @@
 pkgname=firmware-qcom-adreno
-pkgver=20220509
+pkgver=20210919
 pkgrel=0
 pkgdesc="Qualcomm Adreno GPU firmware from linux-firmware"
 url="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"
@@ -15,7 +15,7 @@ builddir="$srcdir/linux-firmware-$pkgver"
 replaces="linux-firmware-qcom"
 _fwdir="/lib/firmware/qcom"

-_gpus="a300 a330 a420 a530 a630 a650 a660"
+_gpus="a300 a530 a630 a650 a660"
 for gpu in $_gpus; do
 	subpackages="$subpackages $pkgname-$gpu:_gpu"
 done
@@ -37,5 +37,5 @@ _gpu() {
 }

 sha512sums="
-0591a35a14a6994ac60571a8e47c00ec013afbfedd4b3326cfe1971b9bd9a07ca7622b17177b3fb57a6c244d2caae12318fcbfac5da5f78a2c085285c9d85cf6  linux-firmware-20220509.tar.gz
+94628158011e65dd65225e687823fc3611b2b2d431b3484a66108959c7fafbcdc0a7be73b7b9e1d1a2d62d40cb7bd81e33d96d822a7b159adc15894607a76a31  linux-firmware-20210919.tar.gz
 "
@@ -1,46 +0,0 @@
-pkgname=firmware-qcom-db410c-wcnss
-pkgver=1034.2.1
-pkgrel=3
-pkgdesc="DragonBoard 410c WiFi/BT firmware"
-url="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/"
-subpackages="$pkgname-doc"
-arch="aarch64 armv7"
-license="custom"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-makedepends="mtools pil-squasher"
-source="https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/linux-board-support-package-r$pkgver.zip"
-builddir="$srcdir/linux-board-support-package-r$pkgver"
-
-# This package is a replacement for linux-firmware-qcom (packaging only necessary
-# firmware plus some missing ones), so it's packaged in /qcom, not /postmarketos.
-replaces="linux-firmware-qcom"
-_fwdir="/lib/firmware/qcom"
-
-unpack() {
-	default_unpack
-
-	# Extract firmware files from FAT file system image
-	mcopy -i "$builddir"/bootloaders-linux/NON-HLOS.bin -p -m -v \
-		::image/wcnss.* "$builddir"
-}
-
-build() {
-	pil-squasher wcnss.mbn wcnss.mdt
-}
-
-package() {
-	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-	install -Dm644 NOTICE.txt "$pkgdir"/usr/share/licenses/$pkgname/NOTICE
-
-	# Use this firmware by default for devices that can use unsigned firmware
-	provides="firmware-qcom-msm8916-wcnss"
-	provider_priority=100
-
-	install -Dm644 "$builddir"/wcnss.mbn -t "$pkgdir/$_fwdir"/apq8016/
-
-	# Still link to old location in case this is installed on other devices
-	mkdir -p "$pkgdir"/lib/firmware/postmarketos
-	ln -s "$_fwdir"/apq8016/wcnss.mbn "$pkgdir"/lib/firmware/postmarketos/wcnss.mdt
-}
-
-sha512sums="4b5d0250552ff3b0a55af9395e62064299a1240f22a5f50383de95723db964351412fa2b38f24fe73fdeb613366e0eb6b3c335600c238546db783ca84647e2d2  linux-board-support-package-r1034.2.1.zip"
Author	SHA1	Message	Date
Martijn Braam	784db2f9eb	Build kernel	2022-03-11 20:41:02 +01:00
Martijn Braam	590d77c95f	Update hello world	2022-03-11 19:49:32 +01:00
Martijn Braam	cc2337760d	Use pmos runner	2022-03-11 19:49:02 +01:00