test0

pika-pbuilder/var/cache/pbuilder/hook.d/01pikarepo

@@ -1,59 +1,27 @@
 #! /bin/bash
 
-mkdir -p /etc/apt/sources.list.d
-
-# Clear /etc/apt/sources.list in favor of deb822 formats
-tee /etc/apt/sources.list <<'EOF'
-## This file is deprecated in PikaOS.
-## See /etc/apt/sources.list.d/system.sources.
-EOF
-
-# Add Debian Repo
-touch /etc/apt/sources.list.d/debian.sources
-tee /etc/apt/sources.list.d/debian.sources <<'EOF'
-X-Repolib-Name: Debian Sources
-Enabled: yes
-Types: deb deb-src
-URIs: http://deb.debian.org/debian
-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
-EOF
-
-# Add Pika Repos
-tee /etc/apt/sources.list.d/system.sources <<'EOF'
-X-Repolib-Name: PikaOS System Sources
-Enabled: yes
-Types: deb
-URIs: https://ppa.pika-os.com/
-Suites: pikauwu
-Components: canary
-X-Repolib-ID: system
-X-Repolib-Default-Mirror: https://ppa.pika-os.com/
-Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key
-EOF
-
-# Add DMO Repos
-tee /etc/apt/sources.list.d/dmo.sources <<'EOF'
-X-Repolib-Name: Multimedia Sources
-Enabled: yes
-Types: deb deb-src
-URIs: https://www.deb-multimedia.org
-Suites: sid
-Components: main non-free
-X-Repolib-Default-Mirror: https://www.deb-multimedia.org/
-Signed-By: /etc/apt/keyrings/deb-multimedia-keyring.gpg
-EOF
-
 # 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
 wget https://github.com/PikaOS-Linux/pika-base-debian-container/raw/main/deb-multimedia-keyring.gpg -O /etc/apt/keyrings/deb-multimedia-keyring.gpg
 
-# Setup apt configration
+rm -fv /etc/apt/sources.list
-mkdir -p /etc/apt/preferences.d/
+touch /etc/apt/sources.list
-tee /etc/apt/preferences.d/0-pika-debian-settings <<'EOF'
+
+tee /etc/apt/sources.list <<'EOF'
+deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian sid main contrib non-free non-free-firmware
+deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian experimental main contrib non-free non-free-firmware
+deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian sid main contrib non-free non-free-firmware
+deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://deb.debian.org/debian experimental main contrib non-free non-free-firmware
+deb [signed-by=/etc/apt/keyrings/deb-multimedia-keyring.gpg] https://www.deb-multimedia.org sid main non-free
+deb-src [signed-by=/etc/apt/keyrings/deb-multimedia-keyring.gpg] https://www.deb-multimedia.org sid main non-free
+deb [signed-by=/etc/apt/keyrings/pika-keyring.gpg.key] https://ppa.pika-os.com/ pikauwu main
+EOF
+
+rm -rf /etc/apt/preferences
+touch /etc/apt/preferences
+
+tee /etc/apt/preferences <<'EOF'
 # Blacklist Packages from being pulled from debian experimental
 Package: *libwebrtc-audio-processing* *selinux*
 Pin: release a=experimental
@@ -67,9 +35,7 @@ Pin-Priority: 550
 Package: *
 Pin: release a=pikauwu,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
@@ -89,6 +55,13 @@ 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
+wget https://github.com/PikaOS-Linux/pika-base-debian-container/raw/main/0-debian-exp-overrides -O /0-debian-exp-overrides
+
+cat /0-debian-exp-overrides >> /etc/apt/preferences
+
+apt-get update -y
+apt-get install apt-utils -y