Skip to content
GitLab
Explore
Sign in
Register
Commits on Source
2
Revert "YOLO fixup for
88ff3aaf
: reproducible Debian: add support for common-$DPKG_ARCH files"
· 134df78f
Holger Levsen
authored
Apr 20, 2018
This reverts commit
8ab28c5c
.
134df78f
reproducible Debian: always run apt-get update (but sometimes only update sources.list later...)
· 624a7f2f
Holger Levsen
authored
Apr 20, 2018
Signed-off-by:
Holger Levsen
<
holger@layer-acht.org
>
624a7f2f
Show whitespace changes
Inline
Side-by-side
update_jdn.sh
View file @
624a7f2f
...
...
@@ -495,7 +495,7 @@ if [ -f /etc/debian_version ] ; then
else
MASTERDEBS
=
""
fi
$UP2DATE
||
(
sudo cp
--preserve
=
mode,timestamps
-r
hosts/
$HOSTNAME
/etc/apt/sources.list /etc/apt
;
sudo
apt-get update
)
$UP2DATE
||
sudo
apt-get update
$UP2DATE
||
sudo
apt-get
install
$DEBS
$MASTERDEBS
# dont (re-)install pbuilder if it's on hold
if
[
"
$(
dpkg-query
-W
-f
=
'${db:Status-Abbrev}\n'
pbuilder
)
"
!=
"hi "
]
;
then
...
...
@@ -555,7 +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
sudo cp
--preserve
=
mode,timestamps
-r
"hosts/
$h
/
$d
/"
*
"/
$d
"
||
true
# YOLO or better use src:fai's fcopy
sudo cp
--preserve
=
mode,timestamps
-r
"hosts/
$h
/
$d
/"
*
"/
$d
"
fi
done
done
...
...