From d12d837369e00eff150a1c850525b315e38cc8ba Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 29 Jul 2025 22:18:17 +0300 Subject: [PATCH] [dev] converted some sources.list to .sources at trixie and sid --- .../epicmorg/debian/13-trixie/main/Dockerfile | 15 ++++++++++----- .../etc/apt/sources.list.d/github_git-lfs.list | 2 -- .../etc/apt/sources.list.d/github_git-lfs.sources | 6 ++++++ .../apt/sources.list.d/github_git-lfs.todo.list | 2 -- .../sources.list.d/github_git-lfs.todo.sources | 7 +++++++ .../sources.list.d/launchpad_git-mainline.list | 5 ----- .../sources.list.d/launchpad_git-mainline.sources | 7 +++++++ .../apt/sources.list.d/launchpad_git-stable.list | 3 --- .../sources.list.d/launchpad_git-stable.sources | 7 +++++++ .../ecosystem/epicmorg/debian/sid/main/Dockerfile | 15 ++++++++++----- .../etc/apt/sources.list.d/github_git-lfs.list | 2 -- .../etc/apt/sources.list.d/github_git-lfs.sources | 6 ++++++ .../apt/sources.list.d/github_git-lfs.todo.list | 2 -- .../sources.list.d/github_git-lfs.todo.sources | 7 +++++++ .../sources.list.d/launchpad_git-mainline.list | 5 ----- .../sources.list.d/launchpad_git-mainline.sources | 7 +++++++ .../apt/sources.list.d/launchpad_git-stable.list | 3 --- .../sources.list.d/launchpad_git-stable.sources | 7 +++++++ 18 files changed, 74 insertions(+), 34 deletions(-) delete mode 100644 linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.list create mode 100644 linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.sources delete mode 100644 linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.todo.list create mode 100644 linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.todo.sources delete mode 100644 linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-mainline.sources delete mode 100644 linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-stable.sources delete mode 100644 linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.list create mode 100644 linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.sources delete mode 100644 linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.todo.list create mode 100644 linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.todo.sources delete mode 100644 linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-mainline.list create mode 100644 linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-mainline.sources delete mode 100644 linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-stable.list create mode 100644 linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-stable.sources diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile b/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile index e411e4dc8..e4014d15c 100644 --- a/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/13-trixie/main/Dockerfile @@ -167,9 +167,12 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN gpg --keyserver keyserver.ubuntu.com --recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \ gpg --export --output /etc/apt/keyrings/launchpad-git.gpg F911AB184317630C59970973E363C90F8F1B6217 && \ rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ - rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list -COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list -COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.sources && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.sources + +COPY etc/apt/sources.list.d/launchpad_git-mainline.sources /etc/apt/sources.list.d/launchpad_git-mainline.sources +COPY etc/apt/sources.list.d/launchpad_git-stable.sources /etc/apt/sources.list.d/launchpad_git-stable.sources RUN apt-get update && \ apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ git @@ -182,8 +185,10 @@ RUN echo "=============================================" && \ # git-lfs official binary ################################################################## RUN curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | gpg --dearmor > /etc/apt/keyrings/github_git-lfs-archive-keyring.gpg && \ - rm -rfv /etc/apt/sources.list.d/github_git-lfs.list -COPY etc/apt/sources.list.d/github_git-lfs.list /etc/apt/sources.list.d/github_git-lfs.list + rm -rfv /etc/apt/sources.list.d/github_git-lfs.list && \ + rm -rfv /etc/apt/sources.list.d/github_git-lfs.sources + +COPY etc/apt/sources.list.d/github_git-lfs.sources /etc/apt/sources.list.d/github_git-lfs.sources RUN apt-get update && \ apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ git \ diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.list b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.list deleted file mode 100644 index 12e6922d6..000000000 --- a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.list +++ /dev/null @@ -1,2 +0,0 @@ -deb [trusted=yes] https://packagecloud.io/github/git-lfs/debian/ trixie main -deb-src [trusted=yes] https://packagecloud.io/github/git-lfs/debian/ trixie main diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.sources b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.sources new file mode 100644 index 000000000..8d8e0c3f2 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.sources @@ -0,0 +1,6 @@ +Types: deb deb-src +URIs: https://packagecloud.io/github/git-lfs/debian/ +Suites: trixie +Components: main +Trusted: yes +Enabled: yes diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.todo.list b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.todo.list deleted file mode 100644 index 3e472861e..000000000 --- a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.todo.list +++ /dev/null @@ -1,2 +0,0 @@ -deb [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/debian/ trixie main -deb-src [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/debian/ trixie main diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.todo.sources b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.todo.sources new file mode 100644 index 000000000..a138c4a9b --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/github_git-lfs.todo.sources @@ -0,0 +1,7 @@ +Types: deb deb-src +URIs: https://packagecloud.io/github/git-lfs/debian/ +Suites: trixie +Components: main +Signed-By: /etc/apt/keyrings/github_git-lfs-archive-keyring.gpg +Trusted: yes +Enabled: yes diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-mainline.list deleted file mode 100644 index e9602c33a..000000000 --- a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-mainline.list +++ /dev/null @@ -1,5 +0,0 @@ -# mainline -deb [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/candidate/ubuntu noble main -deb-src [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/candidate/ubuntu noble main - - diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-mainline.sources b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-mainline.sources new file mode 100644 index 000000000..cecac2eac --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-mainline.sources @@ -0,0 +1,7 @@ +Types: deb deb-src +URIs: https://ppa.launchpadcontent.net/git-core/candidate/ubuntu +Suites: noble +Components: main +Signed-By: /etc/apt/keyrings/launchpad-git.gpg +Trusted: yes +Enabled: yes diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-stable.list deleted file mode 100644 index a12ae44f4..000000000 --- a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-stable.list +++ /dev/null @@ -1,3 +0,0 @@ -# stable -deb [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu noble main -deb-src [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu noble main diff --git a/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-stable.sources b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-stable.sources new file mode 100644 index 000000000..9e2d86ab9 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/13-trixie/main/etc/apt/sources.list.d/launchpad_git-stable.sources @@ -0,0 +1,7 @@ +Types: deb deb-src +URIs: https://ppa.launchpadcontent.net/git-core/ppa/ubuntu +Suites: noble +Components: main +Signed-By: /etc/apt/keyrings/launchpad-git.gpg +Trusted: yes +Enabled: yes diff --git a/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile b/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile index 67c691e4e..969014389 100644 --- a/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/sid/main/Dockerfile @@ -167,9 +167,12 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN gpg --keyserver keyserver.ubuntu.com --recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \ gpg --export --output /etc/apt/keyrings/launchpad-git.gpg F911AB184317630C59970973E363C90F8F1B6217 && \ rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \ - rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list -COPY etc/apt/sources.list.d/launchpad_git-mainline.list /etc/apt/sources.list.d/launchpad_git-mainline.list -COPY etc/apt/sources.list.d/launchpad_git-stable.list /etc/apt/sources.list.d/launchpad_git-stable.list + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.sources && \ + rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.sources + +COPY etc/apt/sources.list.d/launchpad_git-mainline.sources /etc/apt/sources.list.d/launchpad_git-mainline.sources +COPY etc/apt/sources.list.d/launchpad_git-stable.sources /etc/apt/sources.list.d/launchpad_git-stable.sources RUN apt-get update && \ apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ git @@ -182,8 +185,10 @@ RUN echo "=============================================" && \ # git-lfs official binary ################################################################## RUN curl -fsSL https://packagecloud.io/github/git-lfs/gpgkey | gpg --dearmor > /etc/apt/keyrings/github_git-lfs-archive-keyring.gpg && \ - rm -rfv /etc/apt/sources.list.d/github_git-lfs.list -COPY etc/apt/sources.list.d/github_git-lfs.list /etc/apt/sources.list.d/github_git-lfs.list + rm -rfv /etc/apt/sources.list.d/github_git-lfs.list && \ + rm -rfv /etc/apt/sources.list.d/github_git-lfs.sources + +COPY etc/apt/sources.list.d/github_git-lfs.sources /etc/apt/sources.list.d/github_git-lfs.sources RUN apt-get update && \ apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \ git \ diff --git a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.list b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.list deleted file mode 100644 index 12e6922d6..000000000 --- a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.list +++ /dev/null @@ -1,2 +0,0 @@ -deb [trusted=yes] https://packagecloud.io/github/git-lfs/debian/ trixie main -deb-src [trusted=yes] https://packagecloud.io/github/git-lfs/debian/ trixie main diff --git a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.sources b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.sources new file mode 100644 index 000000000..8d8e0c3f2 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.sources @@ -0,0 +1,6 @@ +Types: deb deb-src +URIs: https://packagecloud.io/github/git-lfs/debian/ +Suites: trixie +Components: main +Trusted: yes +Enabled: yes diff --git a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.todo.list b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.todo.list deleted file mode 100644 index 3e472861e..000000000 --- a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.todo.list +++ /dev/null @@ -1,2 +0,0 @@ -deb [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/debian/ trixie main -deb-src [signed-by=/etc/apt/keyrings/github_git-lfs-archive-keyring.gpg] https://packagecloud.io/github/git-lfs/debian/ trixie main diff --git a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.todo.sources b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.todo.sources new file mode 100644 index 000000000..a138c4a9b --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/github_git-lfs.todo.sources @@ -0,0 +1,7 @@ +Types: deb deb-src +URIs: https://packagecloud.io/github/git-lfs/debian/ +Suites: trixie +Components: main +Signed-By: /etc/apt/keyrings/github_git-lfs-archive-keyring.gpg +Trusted: yes +Enabled: yes diff --git a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-mainline.list deleted file mode 100644 index e9602c33a..000000000 --- a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-mainline.list +++ /dev/null @@ -1,5 +0,0 @@ -# mainline -deb [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/candidate/ubuntu noble main -deb-src [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/candidate/ubuntu noble main - - diff --git a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-mainline.sources b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-mainline.sources new file mode 100644 index 000000000..cecac2eac --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-mainline.sources @@ -0,0 +1,7 @@ +Types: deb deb-src +URIs: https://ppa.launchpadcontent.net/git-core/candidate/ubuntu +Suites: noble +Components: main +Signed-By: /etc/apt/keyrings/launchpad-git.gpg +Trusted: yes +Enabled: yes diff --git a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-stable.list deleted file mode 100644 index a12ae44f4..000000000 --- a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-stable.list +++ /dev/null @@ -1,3 +0,0 @@ -# stable -deb [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu noble main -deb-src [signed-by=/etc/apt/keyrings/launchpad-git.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu noble main diff --git a/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-stable.sources b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-stable.sources new file mode 100644 index 000000000..9e2d86ab9 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/sid/main/etc/apt/sources.list.d/launchpad_git-stable.sources @@ -0,0 +1,7 @@ +Types: deb deb-src +URIs: https://ppa.launchpadcontent.net/git-core/ppa/ubuntu +Suites: noble +Components: main +Signed-By: /etc/apt/keyrings/launchpad-git.gpg +Trusted: yes +Enabled: yes