Dockerfile

@@ -9,5 +9,5 @@ RUN ./setup.sh
 RUN apt update
 RUN apt full-upgrade -y
 RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
-RUN wget https://ppa.pika-os.com/pool/main/p/pika-pbuilder/pika-pbuilder_0.2.33-101pika1_all.deb -O ./pika-pbuilder.deb
+RUN wget https://ppa.pika-os.com/pool/main/p/pika-pbuilder/pika-pbuilder_0.2.34-101pika1_all.deb -O ./pika-pbuilder.deb
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata software-properties-common sudo devscripts git eatmydata bc cowbuilder gpg gpg-agent bison build-essential ccache cmake cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar aptly devscripts dh-make rpm2cpio ./pika-pbuilder.deb -o Dpkg::Options::="--force-confnew"

gen-apt-config.py

@@ -1,13 +1,12 @@
 #! /bin/python3
 
 import os, errno
-import apt_pkg
-import apt
 import json
+import subprocess
 
 _APT_CONFIG_PIN="""Package:{PACKAGES}
 Pin: release a=experimental   
-Pin-Priority: 500
+Pin-Priority: 600
 """
 
 def silentremove(filename):
@@ -27,13 +26,10 @@ for file in srcnames_files:
     for line in file.readlines():
         srcname = line.strip()
         srcname_lines.append(srcname)
-        srcrecords = apt_pkg.SourceRecords()
+        result = subprocess.run([current_path + "/apt_experiments", '-n', srcname], stdout=subprocess.PIPE)
-        srcrec = srcrecords.lookup(srcname)
+        stdout = result.stdout
-        if srcrec:
+        pkgname_lines.append(stdout)
-            bins = srcrecords.binaries
+        pkgname_lines.append(stdout + "t64")
-            for bin in bins:
-                pkgname_lines.append(bin)
-                pkgname_lines.append(bin + "t64")
     file.close()
 
 with open (current_path + "/package_pkgnames_overrides") as file:

setup.sh

@@ -19,10 +19,6 @@ Suites: sid experimental
 Components: main contrib non-free non-free-firmware
 X-Repolib-Default-Mirror: http://deb.debian.org/debian
 Signed-by: /usr/share/keyrings/debian-archive-keyring.gpg
-Allow-Insecure: yes
-Allow-Weak: yes
-Allow-Downgrade-To-Insecure: yes
-Trusted: yes
 EOF
 
 # Add Pika Repos
@@ -31,15 +27,11 @@ X-Repolib-Name: PikaOS System Sources
 Enabled: yes
 Types: deb
 URIs: https://ppa.pika-os.com/
-Suites: pikauwu
+Suites: pika
 Components: canary
 X-Repolib-ID: system
 X-Repolib-Default-Mirror: https://ppa.pika-os.com/
 Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key
-Allow-Insecure: yes
-Allow-Weak: yes
-Allow-Downgrade-To-Insecure: yes
-Trusted: yes
 EOF
 
 # Add DMO Repos
@@ -52,15 +44,8 @@ Suites: sid
 Components: main non-free
 X-Repolib-Default-Mirror: https://www.deb-multimedia.org/
 Signed-By: /etc/apt/keyrings/deb-multimedia-keyring.gpg
-Allow-Insecure: yes
-Allow-Weak: yes
-Allow-Downgrade-To-Insecure: yes
-Trusted: yes
 EOF
 
-# Workarounds Repo
-echo "deb [trusted=yes] https://raw.githubusercontent.com/PikaOS-Linux/repo-debian-build-workarounds/main sid main" > /etc/apt/sources.list.d/deb-workarounds.list
-
 # Get keyrings
 mkdir -p /etc/apt/keyrings/
 wget https://github.com/PikaOS-Linux/pika-base-debian-container/raw/main/pika-keyring.gpg.key -O /etc/apt/keyrings/pika-keyring.gpg.key
@@ -78,36 +63,18 @@ Package: *
 Pin: release o=Unofficial Multimedia Packages
 Pin-Priority: 550
 
-Package: *
+Package: pika-abi-bridge*
-Pin: release l=repo-debian-build-workarounds
+Pin: release a=pika,c=canary
 Pin-Priority: 600
 
 # Give pika lowest priority because we don't want it sources overwriting
 Package: *
-Pin: release a=pikauwu,c=canary
+Pin: release a=pika,c=canary
 Pin-Priority: 390
-EOF
 
-tee /etc/apt/preferences.d/1-pika-radeon-settings <<'EOF'
+Package: pika-abi-bridge*
-Package: libhsa-runtime64*
+Pin: release a=pika,c=canary
-Pin: release o=Debian
+Pin-Priority: 600
-Pin-Priority: 100
-
-Package: hipcc*
-Pin: release o=Debian
-Pin-Priority: 100
-
-Package: rocm*
-Pin: release o=Debian
-Pin-Priority: 100
-
-Package: *
-Pin: release c=rocm
-Pin-Priority: 400
-
-Package: amdgpu-core amdgpu-pro-core amdgpu-dkms amdgpu-pro-lib32
-Pin: release a=*
-Pin-Priority: -10
 EOF
 
 wget https://github.com/PikaOS-Linux/pika-base-debian-container/raw/main/0-debian-exp-overrides -O /etc/apt/preferences.d/0-debian-exp-overrides