[neon/infrastructure/pangea-data] imager: do not add Architectures to neon.sources so it uses the dpkg default

[Jonathan Riddell]

Git commit aab05aa1d7e341fee3993d2ee1606d42e0eaba9b by Jonathan Riddell.
Committed on 13/11/2024 at 13:30.
Pushed by jriddell into branch 'master'.

do not add Architectures to neon.sources so it uses the dpkg default

M  +0    -4    imager/config-hooks-neon-arm64/repo.sh
M  +0    -4    imager/config-hooks-neon-bigscreen/repo.sh
M  +0    -4    imager/config-hooks-neon-developer/repo.sh
M  +0    -1    imager/config-hooks-neon-ko/repo.sh
M  +0    -4    imager/config-hooks-neon-mobile/repo.sh
M  +0    -4    imager/config-hooks-neon/repo.sh

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/aab05aa1d7e341fee3993d2ee1606d42e0eaba9b

diff --git a/imager/config-hooks-neon-arm64/repo.sh b/imager/config-hooks-neon-arm64/repo.sh
index f69c3b4..fca84b9 100644
--- a/imager/config-hooks-neon-arm64/repo.sh
+++ b/imager/config-hooks-neon-arm64/repo.sh
@@ -45,9 +45,6 @@ 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
 
-  if [ "$ARCH" = "amd64" ]; then
-      ARCH="amd64 i386"
-  fi
   # add our spiffy new deb822 .sources config
   cat > config/archives/neon.sources << EOF
 X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
@@ -55,7 +52,6 @@ Types: deb deb-src
 URIs: http://archive.neon.kde.org/${NEONARCHIVE}
 Suites: $SUITE
 Components: main
-Architectures: $ARCH
 Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
 EOF
 
diff --git a/imager/config-hooks-neon-bigscreen/repo.sh b/imager/config-hooks-neon-bigscreen/repo.sh
index f69c3b4..fca84b9 100644
--- a/imager/config-hooks-neon-bigscreen/repo.sh
+++ b/imager/config-hooks-neon-bigscreen/repo.sh
@@ -45,9 +45,6 @@ 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
 
-  if [ "$ARCH" = "amd64" ]; then
-      ARCH="amd64 i386"
-  fi
   # add our spiffy new deb822 .sources config
   cat > config/archives/neon.sources << EOF
 X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
@@ -55,7 +52,6 @@ Types: deb deb-src
 URIs: http://archive.neon.kde.org/${NEONARCHIVE}
 Suites: $SUITE
 Components: main
-Architectures: $ARCH
 Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
 EOF
 
diff --git a/imager/config-hooks-neon-developer/repo.sh b/imager/config-hooks-neon-developer/repo.sh
index f69c3b4..fca84b9 100644
--- a/imager/config-hooks-neon-developer/repo.sh
+++ b/imager/config-hooks-neon-developer/repo.sh
@@ -45,9 +45,6 @@ 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
 
-  if [ "$ARCH" = "amd64" ]; then
-      ARCH="amd64 i386"
-  fi
   # add our spiffy new deb822 .sources config
   cat > config/archives/neon.sources << EOF
 X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
@@ -55,7 +52,6 @@ Types: deb deb-src
 URIs: http://archive.neon.kde.org/${NEONARCHIVE}
 Suites: $SUITE
 Components: main
-Architectures: $ARCH
 Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
 EOF
 
diff --git a/imager/config-hooks-neon-ko/repo.sh b/imager/config-hooks-neon-ko/repo.sh
index f07236e..f7866e6 100644
--- a/imager/config-hooks-neon-ko/repo.sh
+++ b/imager/config-hooks-neon-ko/repo.sh
@@ -55,7 +55,6 @@ Types: deb deb-src
 URIs: http://archive.neon.kde.org/${NEONARCHIVE}
 Suites: $SUITE
 Components: main
-Architectures: $ARCH
 Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
 EOF
 
diff --git a/imager/config-hooks-neon-mobile/repo.sh b/imager/config-hooks-neon-mobile/repo.sh
index f69c3b4..fca84b9 100644
--- a/imager/config-hooks-neon-mobile/repo.sh
+++ b/imager/config-hooks-neon-mobile/repo.sh
@@ -45,9 +45,6 @@ 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
 
-  if [ "$ARCH" = "amd64" ]; then
-      ARCH="amd64 i386"
-  fi
   # add our spiffy new deb822 .sources config
   cat > config/archives/neon.sources << EOF
 X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
@@ -55,7 +52,6 @@ Types: deb deb-src
 URIs: http://archive.neon.kde.org/${NEONARCHIVE}
 Suites: $SUITE
 Components: main
-Architectures: $ARCH
 Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
 EOF
 
diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index 4eec932..fca84b9 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -44,9 +44,6 @@ 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
-  if [ "$ARCH" = "amd64" ]; then
-      ARCH="amd64 i386"
-  fi
 
   # add our spiffy new deb822 .sources config
   cat > config/archives/neon.sources << EOF
@@ -55,7 +52,6 @@ Types: deb deb-src
 URIs: http://archive.neon.kde.org/${NEONARCHIVE}
 Suites: $SUITE
 Components: main
-Architectures: $ARCH
 Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.asc
 EOF