[neon/infrastructure/pangea-data] imager: sync the editions again
Carlos De Maine
null at kde.org
Tue Aug 27 16:05:06 BST 2024
Git commit eda88761b3868509261352e5a9d8a89fe6634961 by Carlos De Maine.
Committed on 27/08/2024 at 15:05.
Pushed by carlosdem into branch 'master'.
sync the editions again
M +11 -21 imager/config-hooks-neon-bigscreen/repo.sh
M +11 -21 imager/config-hooks-neon-developer/repo.sh
M +11 -21 imager/config-hooks-neon-ko/repo.sh
M +11 -21 imager/config-hooks-neon-mobile/repo.sh
https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/eda88761b3868509261352e5a9d8a89fe6634961
diff --git a/imager/config-hooks-neon-bigscreen/repo.sh b/imager/config-hooks-neon-bigscreen/repo.sh
index 17ea4d0..17fa0fd 100644
--- a/imager/config-hooks-neon-bigscreen/repo.sh
+++ b/imager/config-hooks-neon-bigscreen/repo.sh
@@ -24,38 +24,28 @@ apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
else
-apt install -y curl
-
- # use this hack until new neon-keyring is in the wild, then we can use cp down below
- mkdir -p /etc/apt/keyring
- chmod 700 ~/.gnupg
- curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" | tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
- gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt/keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
- gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
- gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
-
# use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
- cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ cp /etc/apt/keyrings/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
chmod 644 config/archives/ubuntu-defaults.key || true
- # cp our non-armoured (binary) public key to where it needs to be
- mkdir -p chroot/etc/apt/keyring/
- cp /etc/apt/keyring/* chroot/etc/apt/keyring/
+ # ensure our non-armoured (binary) public key is copied into the chroot as expected
+ mkdir -p chroot/etc/apt/keyrings/
+ cp /etc/apt/keyrings/* chroot/etc/apt/keyrings/
- # make sure _apt can read this file. it may get copied into the chroot
- chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.asc || true
- chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.gpg || true
+ # make sure _apt can read this file. it will get copied into the chroot
+ chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.asc || true
+ chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.gpg || true
# use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
cat <<EOF >config/archives/neon.list
-deb [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
-deb-src [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb [signed-by=/etc/apt/keyrings/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb-src [signed-by=/etc/apt/keyrings/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
EOF
# add a nice depreciation message when we actually have depreciated the above hack
#echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
- # add or spiffy new deb822 .sources config
+ # add our spiffy new deb822 .sources config
cat > config/archives/neon.sources << EOF
X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
Types: deb deb-src
@@ -63,7 +53,7 @@ URIs: http://archive.neon.kde.org/${NEONARCHIVE}
Suites: $SUITE
Components: main
Architectures: $ARCH
-Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
+Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
EOF
# check our stuffs are in the right place
diff --git a/imager/config-hooks-neon-developer/repo.sh b/imager/config-hooks-neon-developer/repo.sh
index 17ea4d0..17fa0fd 100644
--- a/imager/config-hooks-neon-developer/repo.sh
+++ b/imager/config-hooks-neon-developer/repo.sh
@@ -24,38 +24,28 @@ apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
else
-apt install -y curl
-
- # use this hack until new neon-keyring is in the wild, then we can use cp down below
- mkdir -p /etc/apt/keyring
- chmod 700 ~/.gnupg
- curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" | tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
- gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt/keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
- gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
- gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
-
# use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
- cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ cp /etc/apt/keyrings/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
chmod 644 config/archives/ubuntu-defaults.key || true
- # cp our non-armoured (binary) public key to where it needs to be
- mkdir -p chroot/etc/apt/keyring/
- cp /etc/apt/keyring/* chroot/etc/apt/keyring/
+ # ensure our non-armoured (binary) public key is copied into the chroot as expected
+ mkdir -p chroot/etc/apt/keyrings/
+ cp /etc/apt/keyrings/* chroot/etc/apt/keyrings/
- # make sure _apt can read this file. it may get copied into the chroot
- chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.asc || true
- chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.gpg || true
+ # make sure _apt can read this file. it will get copied into the chroot
+ chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.asc || true
+ chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.gpg || true
# use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
cat <<EOF >config/archives/neon.list
-deb [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
-deb-src [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb [signed-by=/etc/apt/keyrings/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb-src [signed-by=/etc/apt/keyrings/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
EOF
# add a nice depreciation message when we actually have depreciated the above hack
#echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
- # add or spiffy new deb822 .sources config
+ # add our spiffy new deb822 .sources config
cat > config/archives/neon.sources << EOF
X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
Types: deb deb-src
@@ -63,7 +53,7 @@ URIs: http://archive.neon.kde.org/${NEONARCHIVE}
Suites: $SUITE
Components: main
Architectures: $ARCH
-Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
+Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
EOF
# check our stuffs are in the right place
diff --git a/imager/config-hooks-neon-ko/repo.sh b/imager/config-hooks-neon-ko/repo.sh
index 17ea4d0..17fa0fd 100644
--- a/imager/config-hooks-neon-ko/repo.sh
+++ b/imager/config-hooks-neon-ko/repo.sh
@@ -24,38 +24,28 @@ apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
else
-apt install -y curl
-
- # use this hack until new neon-keyring is in the wild, then we can use cp down below
- mkdir -p /etc/apt/keyring
- chmod 700 ~/.gnupg
- curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" | tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
- gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt/keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
- gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
- gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
-
# use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
- cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ cp /etc/apt/keyrings/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
chmod 644 config/archives/ubuntu-defaults.key || true
- # cp our non-armoured (binary) public key to where it needs to be
- mkdir -p chroot/etc/apt/keyring/
- cp /etc/apt/keyring/* chroot/etc/apt/keyring/
+ # ensure our non-armoured (binary) public key is copied into the chroot as expected
+ mkdir -p chroot/etc/apt/keyrings/
+ cp /etc/apt/keyrings/* chroot/etc/apt/keyrings/
- # make sure _apt can read this file. it may get copied into the chroot
- chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.asc || true
- chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.gpg || true
+ # make sure _apt can read this file. it will get copied into the chroot
+ chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.asc || true
+ chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.gpg || true
# use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
cat <<EOF >config/archives/neon.list
-deb [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
-deb-src [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb [signed-by=/etc/apt/keyrings/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb-src [signed-by=/etc/apt/keyrings/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
EOF
# add a nice depreciation message when we actually have depreciated the above hack
#echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
- # add or spiffy new deb822 .sources config
+ # add our spiffy new deb822 .sources config
cat > config/archives/neon.sources << EOF
X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
Types: deb deb-src
@@ -63,7 +53,7 @@ URIs: http://archive.neon.kde.org/${NEONARCHIVE}
Suites: $SUITE
Components: main
Architectures: $ARCH
-Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
+Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
EOF
# check our stuffs are in the right place
diff --git a/imager/config-hooks-neon-mobile/repo.sh b/imager/config-hooks-neon-mobile/repo.sh
index 17ea4d0..17fa0fd 100644
--- a/imager/config-hooks-neon-mobile/repo.sh
+++ b/imager/config-hooks-neon-mobile/repo.sh
@@ -24,38 +24,28 @@ apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
else
-apt install -y curl
-
- # use this hack until new neon-keyring is in the wild, then we can use cp down below
- mkdir -p /etc/apt/keyring
- chmod 700 ~/.gnupg
- curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" | tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
- gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt/keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
- gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
- gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
-
# use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
- cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ cp /etc/apt/keyrings/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
chmod 644 config/archives/ubuntu-defaults.key || true
- # cp our non-armoured (binary) public key to where it needs to be
- mkdir -p chroot/etc/apt/keyring/
- cp /etc/apt/keyring/* chroot/etc/apt/keyring/
+ # ensure our non-armoured (binary) public key is copied into the chroot as expected
+ mkdir -p chroot/etc/apt/keyrings/
+ cp /etc/apt/keyrings/* chroot/etc/apt/keyrings/
- # make sure _apt can read this file. it may get copied into the chroot
- chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.asc || true
- chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.gpg || true
+ # make sure _apt can read this file. it will get copied into the chroot
+ chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.asc || true
+ chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.gpg || true
# use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
cat <<EOF >config/archives/neon.list
-deb [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
-deb-src [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb [signed-by=/etc/apt/keyrings/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb-src [signed-by=/etc/apt/keyrings/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
EOF
# add a nice depreciation message when we actually have depreciated the above hack
#echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
- # add or spiffy new deb822 .sources config
+ # add our spiffy new deb822 .sources config
cat > config/archives/neon.sources << EOF
X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
Types: deb deb-src
@@ -63,7 +53,7 @@ URIs: http://archive.neon.kde.org/${NEONARCHIVE}
Suites: $SUITE
Components: main
Architectures: $ARCH
-Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
+Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
EOF
# check our stuffs are in the right place
More information about the Neon-commits
mailing list