From d8331794da69e6078dd1589cfbb052490fe1a207 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Mon, 15 Jul 2024 23:36:48 +0300 Subject: [PATCH] try changing pbuilder resolver --- .../var/cache/pbuilder/hook.d/01pikarepo | 81 ++++++++++++------- .../cache/pbuilder/rc.examples/pbuilderrc-v2 | 1 + .../pbuilder/rc.examples/pbuilderrc-v2-lto | 1 + .../cache/pbuilder/rc.examples/pbuilderrc-v3 | 1 + .../pbuilder/rc.examples/pbuilderrc-v3-lto | 1 + .../cache/pbuilder/rc.examples/pbuilderrc-v4 | 1 + .../pbuilder/rc.examples/pbuilderrc-v4-lto | 1 + 7 files changed, 59 insertions(+), 28 deletions(-) diff --git a/pika-pbuilder/var/cache/pbuilder/hook.d/01pikarepo b/pika-pbuilder/var/cache/pbuilder/hook.d/01pikarepo index b2c22ef..0b5f251 100644 --- a/pika-pbuilder/var/cache/pbuilder/hook.d/01pikarepo +++ b/pika-pbuilder/var/cache/pbuilder/hook.d/01pikarepo @@ -1,27 +1,59 @@ #! /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 -rm -fv /etc/apt/sources.list -touch /etc/apt/sources.list - -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' +# Setup apt configration +mkdir -p /etc/apt/preferences.d/ +tee /etc/apt/preferences.d/0-pika-debian-settings <<'EOF' # Blacklist Packages from being pulled from debian experimental Package: *libwebrtc-audio-processing* *selinux* Pin: release a=experimental @@ -35,7 +67,9 @@ 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 @@ -55,17 +89,8 @@ 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 /0-debian-exp-overrides +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 -cat /0-debian-exp-overrides >> /etc/apt/preferences - -mkdir -p /etc/apt/preferences.d/ -cp -vf /etc/apt/preferences /etc/apt/preferences.d/0-pika-debian-settings - - -apt-get update -y -apt-get install apt-utils -y \ No newline at end of file +apt-get update -y \ No newline at end of file diff --git a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2 b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2 index d57d670..3cb5fe0 100644 --- a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2 +++ b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2 @@ -20,3 +20,4 @@ DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]/--keyring=*}) DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]} --keyring=/usr/share/keyrings/debian-archive-keyring.gpg) EXTRAPACKAGES=eatmydata EATMYDATA=yes +PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" diff --git a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2-lto b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2-lto index 087471d..7ee4bff 100644 --- a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2-lto +++ b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v2-lto @@ -20,3 +20,4 @@ DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]/--keyring=*}) DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]} --keyring=/usr/share/keyrings/debian-archive-keyring.gpg) EXTRAPACKAGES=eatmydata EATMYDATA=yes +PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" diff --git a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3 b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3 index 8d1c974..aa08f82 100644 --- a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3 +++ b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3 @@ -20,3 +20,4 @@ DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]/--keyring=*}) DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]} --keyring=/usr/share/keyrings/debian-archive-keyring.gpg) EXTRAPACKAGES=eatmydata EATMYDATA=yes +PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" diff --git a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3-lto b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3-lto index fab6b0f..4d7e6c0 100644 --- a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3-lto +++ b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v3-lto @@ -20,3 +20,4 @@ DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]/--keyring=*}) DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]} --keyring=/usr/share/keyrings/debian-archive-keyring.gpg) EXTRAPACKAGES=eatmydata EATMYDATA=yes +PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" diff --git a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4 b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4 index 6077ace..8df3620 100644 --- a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4 +++ b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4 @@ -20,3 +20,4 @@ DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]/--keyring=*}) DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]} --keyring=/usr/share/keyrings/debian-archive-keyring.gpg) EXTRAPACKAGES=eatmydata EATMYDATA=yes +PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt" diff --git a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4-lto b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4-lto index 827b76c..3faf0bb 100644 --- a/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4-lto +++ b/pika-pbuilder/var/cache/pbuilder/rc.examples/pbuilderrc-v4-lto @@ -20,3 +20,4 @@ DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]/--keyring=*}) DEBOOTSTRAPOPTS=(${DEBOOTSTRAPOPTS[@]} --keyring=/usr/share/keyrings/debian-archive-keyring.gpg) EXTRAPACKAGES=eatmydata EATMYDATA=yes +PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends-apt"