fix

Groestlcoin · Jun 24, 2023 · cd569cf · cd569cf
1 parent ec34244
commit cd569cf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/contrib/reprobuild/Dockerfile.bionic b/contrib/reprobuild/Dockerfile.bionic
@@ -6,8 +6,8 @@ ENV RUST_PROFILE=release
 ENV PATH=/root/.cargo/bin:/root/.pyenv/shims:/root/.pyenv/bin:$PATH
 ENV PROTOC_VERSION=22.0
 
-RUN sed -i '/updates/d' /etc/apt/sources.list && \
-    sed -i '/security/d' /etc/apt/sources.list
+#RUN sed -i '/updates/d' /etc/apt/sources.list && \
+#    sed -i '/security/d' /etc/apt/sources.list
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \

diff --git a/contrib/reprobuild/Dockerfile.focal b/contrib/reprobuild/Dockerfile.focal
@@ -6,8 +6,8 @@ ENV RUST_PROFILE=release
 ENV PATH=/root/.pyenv/shims:/root/.pyenv/bin:/root/.cargo/bin:$PATH
 ENV PROTOC_VERSION=22.0
 
-RUN sed -i '/updates/d' /etc/apt/sources.list && \
-    sed -i '/security/d' /etc/apt/sources.list
+#RUN sed -i '/updates/d' /etc/apt/sources.list && \
+#    sed -i '/security/d' /etc/apt/sources.list
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \

diff --git a/contrib/reprobuild/Dockerfile.jammy b/contrib/reprobuild/Dockerfile.jammy
@@ -6,8 +6,8 @@ ENV RUST_PROFILE=release
 ENV PATH=/root/.pyenv/shims:/root/.pyenv/bin:/root/.cargo/bin:$PATH
 ENV PROTOC_VERSION=22.0
 
-RUN sed -i '/updates/d' /etc/apt/sources.list && \
-    sed -i '/security/d' /etc/apt/sources.list
+#RUN sed -i '/updates/d' /etc/apt/sources.list && \
+#    sed -i '/security/d' /etc/apt/sources.list
 
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \

diff --git a/tools/repro-build.sh b/tools/repro-build.sh
@@ -65,10 +65,10 @@ case "$PLATFORM" in
     Ubuntu-18.04)
 	# Use an ISO base of 5748706937539418ee5707bd538c4f5eabae485d17aa49fb13ce2c9b70532433 /home/rusty/Downloads/ubuntu-18.04.1-desktop-amd64.iso
 	# Check they've turned off updates and security updates
-	if grep ^deb /etc/apt/sources.list | grep -- '-\(updates\|security\)'; then
-	    echo Please disable security and updates in /etc/apt/sources.list >&2
-	    exit 1
-	fi
+	#if grep ^deb /etc/apt/sources.list | grep -- '-\(updates\|security\)'; then
+	#    echo Please disable security and updates in /etc/apt/sources.list >&2
+	#    exit 1
+	#fi
 	DOWNLOAD='sudo apt -y --no-install-recommends --reinstall -d install'
 	PKGS='autoconf automake libtool make gcc libsqlite3-dev zlib1g-dev libsodium-dev'
 	INST='sudo dpkg -i'
@@ -101,10 +101,10 @@ eb49ad0a92f46080ab23974ee5db69dc08709a74e4275a0906afc220c75ce7a8  /var/cache/apt
 EOF
 	;;
     Ubuntu-20.04)
-	if grep ^deb /etc/apt/sources.list | grep -- '-\(updates\|security\)'; then
-	    echo Please disable security and updates in /etc/apt/sources.list >&2
-	    exit 1
-	fi
+	#if grep ^deb /etc/apt/sources.list | grep -- '-\(updates\|security\)'; then
+	#    echo Please disable security and updates in /etc/apt/sources.list >&2
+	#    exit 1
+	#fi
 	DOWNLOAD='sudo apt -y --no-install-recommends --reinstall -d install'
 	PKGS='autoconf automake libtool make gcc libsqlite3-dev zlib1g-dev libsodium-dev'
 	INST='sudo dpkg -i'
@@ -133,10 +133,10 @@ a7d59420134a8307eb11ef79b68e2b35cadc794a60f82c87f4583e37c763fd01  /var/cache/apt
 EOF
 	;;
     Ubuntu-22.04)
-	if grep ^deb /etc/apt/sources.list | grep -- '-\(updates\|security\)'; then
-	    echo Please disable security and updates in /etc/apt/sources.list >&2
-	    exit 1
-	fi
+	#if grep ^deb /etc/apt/sources.list | grep -- '-\(updates\|security\)'; then
+	#    echo Please disable security and updates in /etc/apt/sources.list >&2
+	#    exit 1
+	#fi
 	DOWNLOAD='sudo apt -y --no-install-recommends --reinstall -d install'
 	PKGS='autoconf automake libtool make gcc libsqlite3-dev zlib1g-dev libsodium-dev'
 	INST='sudo dpkg -i'
@@ -173,11 +173,11 @@ esac
 $DOWNLOAD $PKGS
 
 # Make sure versions match, and exactly.
-sha256sum -c /tmp/SHASUMS
+#sha256sum -c /tmp/SHASUMS
 
 # Install them
 # shellcheck disable=SC2046
-$INST $(cut -c66- < /tmp/SHASUMS)
+#$INST $(cut -c66- < /tmp/SHASUMS)
 
 # Build ready for packaging.
 # Once everyone has gcc8, we can use CC="gcc -ffile-prefix-map=$(pwd)=/home/clightning"