[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: Revert "fixup 88ff3aaf: reproducible Debian: add support for common-$DPKG_ARCH files"

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
1f8de007 by Holger Levsen at 2018-04-20T22:49:58-03:00
Revert "fixup 88ff3aaf: reproducible Debian: add support for common-$DPKG_ARCH files"

This reverts commit 93a095da4723ed0bad2f60d208d94ba079ce375b.

- - - - -
8ab28c5c by Holger Levsen at 2018-04-20T22:50:43-03:00
YOLO fixup for 88ff3aaf: reproducible Debian: add support for common-$DPKG_ARCH files

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
5c0becb7 by Holger Levsen at 2018-04-20T22:52:03-03:00
reproducible Debian: add simple test cases for previous fixes

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- hosts/common-arm64/etc/apt/sources.list
- hosts/common/etc/apt/sources.list
- update_jdn.sh


Changes:

=====================================
hosts/common-arm64/etc/apt/sources.list
=====================================
--- a/hosts/common-arm64/etc/apt/sources.list
+++ b/hosts/common-arm64/etc/apt/sources.list
@@ -1,3 +1,5 @@
+# common-arm64
+
 # deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial main restricted
 
 # deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted


=====================================
hosts/common/etc/apt/sources.list
=====================================
--- a/hosts/common/etc/apt/sources.list
+++ b/hosts/common/etc/apt/sources.list
@@ -1,3 +1,5 @@
+# common
+
 deb http://deb.debian.org/debian/ stretch main contrib non-free
 #deb-src http://deb.debian.org/debian/ stretch main contrib non-free
 


=====================================
update_jdn.sh
=====================================
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -555,11 +555,7 @@ for h in common common-amd64 common-i386 common-arm64 common-armhf "$HOSTNAME" ;
 	fi
 	for d in etc usr ; do
 		if [ -d "hosts/$h/$d" ]; then
-			for sd in * ; do
-				if [ -d "hosts/$h/$d/$sd" ]; then
-					sudo cp --preserve=mode,timestamps -r "hosts/$h/$d/$sd" "/$d"
-				fi
-			done
+			sudo cp --preserve=mode,timestamps -r "hosts/$h/$d/"* "/$d" || true # YOLO or better use src:fai's fcopy
 		fi
 	done
 done



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/93a095da4723ed0bad2f60d208d94ba079ce375b...5c0becb71394c918ed34aa0659dfa4b46b7813c9

---
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/93a095da4723ed0bad2f60d208d94ba079ce375b...5c0becb71394c918ed34aa0659dfa4b46b7813c9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180421/148cc97e/attachment.html>