From 0f431134838211d1fb2e6e4e5138855172c82acd Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (Cosmic Fusion)" <83735213+CosmicFusion@users.noreply.github.com> Date: Sun, 27 Aug 2023 21:20:23 +0300 Subject: [PATCH] Switch to new internal repos --- pika-sources/debian/preinst | 1 + .../etc/apt/preferences.d/0-pika-firefox-settings | 4 ---- pika-sources/etc/apt/preferences.d/0-pika-radeon-settings | 4 ---- pika-sources/etc/apt/sources.list.d/pika-amdgpu.sources | 7 ------- pika-sources/etc/apt/sources.list.d/pika-amdvlk.sources | 7 ------- .../etc/apt/sources.list.d/pika-extradeb-apps.sources | 7 ------- .../etc/apt/sources.list.d/pika-kubuntu-backports.sources | 7 ------- .../etc/apt/sources.list.d/pika-launchpad.sources | 7 ------- .../{pika-apt.sources => pika-main.sources} | 2 +- pika-sources/etc/apt/sources.list.d/pika-mozilla.sources | 7 ------- pika-sources/etc/apt/sources.list.d/pika-rocm.sources | 8 -------- pika-sources/etc/apt/sources.list.d/pika-steam.sources | 8 -------- pika-sources/etc/apt/sources.list.d/pika-wine.sources | 8 -------- .../etc/apt/sources.list.d/pika-xtradeb-play.sources | 7 ------- pika-sources/usr/share/dpkg/scripts/steamdeps | 2 +- 15 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 pika-sources/etc/apt/preferences.d/0-pika-firefox-settings delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-amdgpu.sources delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-amdvlk.sources delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-extradeb-apps.sources delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-kubuntu-backports.sources delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-launchpad.sources rename pika-sources/etc/apt/sources.list.d/{pika-apt.sources => pika-main.sources} (81%) delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-mozilla.sources delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-rocm.sources delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-steam.sources delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-wine.sources delete mode 100644 pika-sources/etc/apt/sources.list.d/pika-xtradeb-play.sources diff --git a/pika-sources/debian/preinst b/pika-sources/debian/preinst index a350ba4..09b1613 100644 --- a/pika-sources/debian/preinst +++ b/pika-sources/debian/preinst @@ -3,3 +3,4 @@ set -e rm -rf /etc/apt/sources.list.d/pika-*.source || true +rm -rf /etc/apt/preferences.d/*pika* || true diff --git a/pika-sources/etc/apt/preferences.d/0-pika-firefox-settings b/pika-sources/etc/apt/preferences.d/0-pika-firefox-settings deleted file mode 100644 index 34a87c7..0000000 --- a/pika-sources/etc/apt/preferences.d/0-pika-firefox-settings +++ /dev/null @@ -1,4 +0,0 @@ -# Firefox Priority Override -Package: * -Pin: release o=LP-PPA-mozillateam -Pin-Priority: 501 \ No newline at end of file diff --git a/pika-sources/etc/apt/preferences.d/0-pika-radeon-settings b/pika-sources/etc/apt/preferences.d/0-pika-radeon-settings index 67c5330..8001e8b 100644 --- a/pika-sources/etc/apt/preferences.d/0-pika-radeon-settings +++ b/pika-sources/etc/apt/preferences.d/0-pika-radeon-settings @@ -1,7 +1,3 @@ -Package: * -Pin: release o=repo.radeon.com -Pin-Priority: 200 - Package: libhsa-runtime64* Pin: release o=Ubuntu Pin-Priority: 100 diff --git a/pika-sources/etc/apt/sources.list.d/pika-amdgpu.sources b/pika-sources/etc/apt/sources.list.d/pika-amdgpu.sources deleted file mode 100644 index 159a207..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-amdgpu.sources +++ /dev/null @@ -1,7 +0,0 @@ -X-Repolib-Name: Official AMDGPU Sources -Enabled: yes -Types: deb deb-src -URIs: https://repo.radeon.com/amdgpu/5.5.3/ubuntu -Suites: jammy -Components: main proprietary -Signed-By: /etc/apt/keyrings/rocm-keyring.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-amdvlk.sources b/pika-sources/etc/apt/sources.list.d/pika-amdvlk.sources deleted file mode 100644 index 67b67b4..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-amdvlk.sources +++ /dev/null @@ -1,7 +0,0 @@ -X-Repolib-Name: Official AMDVLK Sources -Enabled: yes -Types: deb -URIs: https://repo.radeon.com/amdvlk/apt/debian -Suites: bionic -Components: main -Signed-By: /etc/apt/keyrings/amdvlk.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-extradeb-apps.sources b/pika-sources/etc/apt/sources.list.d/pika-extradeb-apps.sources deleted file mode 100644 index f8f92b5..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-extradeb-apps.sources +++ /dev/null @@ -1,7 +0,0 @@ -X-Repolib-Name: XtraDeb Apps PPA -Enabled: yes -Types: deb deb-src -URIs: https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu -Suites: lunar -Components: main -Signed-By: /etc/apt/keyrings/xtradeb-ubuntu-apps.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-kubuntu-backports.sources b/pika-sources/etc/apt/sources.list.d/pika-kubuntu-backports.sources deleted file mode 100644 index d6b6004..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-kubuntu-backports.sources +++ /dev/null @@ -1,7 +0,0 @@ -X-Repolib-Name: Kubuntu KDE Backports Sources -Enabled: yes -Types: deb deb-src -URIs: https://ppa.launchpadcontent.net/kubuntu-ppa/backports/ubuntu -Suites: lunar -Components: main -Signed-By: /etc/apt/keyrings/kubuntu-ppa.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-launchpad.sources b/pika-sources/etc/apt/sources.list.d/pika-launchpad.sources deleted file mode 100644 index ff1f506..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-launchpad.sources +++ /dev/null @@ -1,7 +0,0 @@ -X-Repolib-Name: PikaOS Launchpad Sources -Enabled: yes -Types: deb deb-src -URIs: https://ppa.launchpadcontent.net/pikaos/pika/ubuntu -Suites: lunar -Components: main -Signed-By: /etc/apt/keyrings/pika-ppa-keyring.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-apt.sources b/pika-sources/etc/apt/sources.list.d/pika-main.sources similarity index 81% rename from pika-sources/etc/apt/sources.list.d/pika-apt.sources rename to pika-sources/etc/apt/sources.list.d/pika-main.sources index ac478b1..a0c542d 100644 --- a/pika-sources/etc/apt/sources.list.d/pika-apt.sources +++ b/pika-sources/etc/apt/sources.list.d/pika-main.sources @@ -3,5 +3,5 @@ Enabled: yes Types: deb deb-src URIs: https://ppa.pika-os.com/ Suites: lunar -Components: main +Components: main amdgpu rocm external Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-mozilla.sources b/pika-sources/etc/apt/sources.list.d/pika-mozilla.sources deleted file mode 100644 index 297eedb..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-mozilla.sources +++ /dev/null @@ -1,7 +0,0 @@ -X-Repolib-Name: Official Mozilla Sources -Enabled: yes -Types: deb deb-src -URIs: https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu -Suites: lunar -Components: main -Signed-By: /etc/apt/keyrings/mozillateam-ubuntu-ppa.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-rocm.sources b/pika-sources/etc/apt/sources.list.d/pika-rocm.sources deleted file mode 100644 index 11e869a..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-rocm.sources +++ /dev/null @@ -1,8 +0,0 @@ -X-Repolib-Name: Official ROCm Sources -Enabled: yes -Types: deb -URIs: https://repo.radeon.com/rocm/apt/5.6 -Suites: jammy -Components: main -Architectures: amd64 -Signed-By: /etc/apt/keyrings/rocm-keyring.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-steam.sources b/pika-sources/etc/apt/sources.list.d/pika-steam.sources deleted file mode 100644 index 9282921..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-steam.sources +++ /dev/null @@ -1,8 +0,0 @@ -X-Repolib-Name: Official Steam Sources -Enabled: yes -Types: deb deb-src -URIs: http://repo.steampowered.com/steam -Suites: stable -Components: steam -Architectures: amd64 i386 -Signed-By: /etc/apt/keyrings/steam_pika.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-wine.sources b/pika-sources/etc/apt/sources.list.d/pika-wine.sources deleted file mode 100644 index dc00c72..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-wine.sources +++ /dev/null @@ -1,8 +0,0 @@ -X-Repolib-Name: Official WineHQ Sources -Enabled: yes -Types: deb deb-src -URIs: https://dl.winehq.org/wine-builds/ubuntu -Suites: lunar -Components: main -Architectures: amd64 i386 -Signed-By: /etc/apt/keyrings/winehq-archive.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-xtradeb-play.sources b/pika-sources/etc/apt/sources.list.d/pika-xtradeb-play.sources deleted file mode 100644 index 52b519a..0000000 --- a/pika-sources/etc/apt/sources.list.d/pika-xtradeb-play.sources +++ /dev/null @@ -1,7 +0,0 @@ -X-Repolib-Name: XtraDeb Play PPA -Enabled: yes -Types: deb deb-src -URIs: https://ppa.launchpadcontent.net/xtradeb/play/ubuntu -Suites: lunar -Components: main -Signed-By: /etc/apt/keyrings/xtradeb-ubuntu-play.gpg.key diff --git a/pika-sources/usr/share/dpkg/scripts/steamdeps b/pika-sources/usr/share/dpkg/scripts/steamdeps index 8e3110e..e52babd 100755 --- a/pika-sources/usr/share/dpkg/scripts/steamdeps +++ b/pika-sources/usr/share/dpkg/scripts/steamdeps @@ -21,5 +21,5 @@ check_output = subprocess.run(["dpkg -s libc6:amd64 && dpkg -s libc6:i386"], she if (check_output.returncode) != 0: subprocess.run(["/usr/bin/x-terminal-emulator -e bash -c 'sudo apt install -y libc6:amd64 libc6:i386'"], shell=True) exit(0) -else +else: exit(0) \ No newline at end of file