diff --git a/pika-pbuilder/var/cache/pbuilder/hook.d/E01pikarepo b/pika-pbuilder/var/cache/pbuilder/hook.d/E01pikarepo index ada17ce..ed5317a 100755 --- a/pika-pbuilder/var/cache/pbuilder/hook.d/E01pikarepo +++ b/pika-pbuilder/var/cache/pbuilder/hook.d/E01pikarepo @@ -3,6 +3,7 @@ apt-get install wget -y mkdir -p /etc/apt/sources.list.d +rm -rf /etc/apt/sources.list.d/* # Clear /etc/apt/sources.list in favor of deb822 formats tee /etc/apt/sources.list <<'EOF' @@ -21,15 +22,8 @@ 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 -touch /etc/apt/apt.conf.d/99verify-peer.conf \ -&& echo >>/etc/apt/apt.conf.d/99verify-peer.conf "Acquire { https::Verify-Peer false }" - chmod 755 /etc /etc/ssl /etc/ssl/certs chmod 644 /etc/ssl/certs/ca-certificates.crt @@ -44,15 +38,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 @@ -65,15 +55,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 @@ -91,36 +74,18 @@ Package: * Pin: release o=Unofficial Multimedia Packages Pin-Priority: 550 -Package: * -Pin: release l=repo-debian-build-workarounds +Package: pika-abi-bridge* +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: libhsa-runtime64* -Pin: release o=Debian -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 +Package: pika-abi-bridge* +Pin: release a=pika,c=canary +Pin-Priority: 600 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