From 6b5da3d86615c52209b4c833f157a5ba065742d6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 31 Mar 2019 16:43:03 +0200 Subject: Docker: remove duplicate installation of live-build --- .../hooks/live/40-linux-firmware.chroot | 36 ++++++++++++++++++++++ docker/Dockerfile | 7 ----- 2 files changed, 36 insertions(+), 7 deletions(-) create mode 100755 data/live-build-config/hooks/live/40-linux-firmware.chroot diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot new file mode 100755 index 00000000..7cd51ffd --- /dev/null +++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot @@ -0,0 +1,36 @@ +#!/bin/sh + +# To get the possibility of reproducible builds we pin to a specific commit +# of the linux-firmware repository +COMMIT="7bc246451318b3536d9bfd3c4e46d541a9831b33" + +echo I: Retrieving Linux Firmware (commit: ${COMMIT}) + +wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz -P /tmp +tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /lib +mv /lib/linux-firmware-${COMMIT} /lib/firmware + +# We do not need all firmware blobs .. cleanup +RM_FIRMWARE=" \ + v4l-cx* \ + s5p-mfc* \ + nvidia \ + amdgpu \ + i915 \ + radeon \ + matrox \ + mediatek \ + qed \ + sb16 \ + ti-connectivity \ + ueagle-atm \ + dvb-* \ + v4l-* \ + i915 \ + qcom \ + ctfw-* \ + ct2fw-* \ + " +for dir in ${RM_FIRMWARE}; do + rm -rf /lib/firmware/${dir} +done diff --git a/docker/Dockerfile b/docker/Dockerfile index 46df8e4c..0dcab157 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -282,13 +282,6 @@ RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sourc apt-get update && \ rm -rf /var/lib/apt/lists/* -# Update live-build -RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \ - apt-get update && apt-get install -y -t stretch live-build && \ - rm -f /etc/apt/sources.list.d/stretch.list && \ - apt-get update && \ - rm -rf /var/lib/apt/lists/* - # Install packer RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ jq -r -M '.current_version')"; \ -- cgit v1.2.3 From d68e91534b552738c3065049fb65e4bd7d871f75 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 31 Mar 2019 16:44:14 +0200 Subject: Docker: remove duplicate installation of python3-pystache --- docker/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0dcab157..0b3c4594 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -45,7 +45,6 @@ RUN apt-get update && apt-get install -y \ mc \ pbuilder \ devscripts \ - python3-pystache \ squashfs-tools \ autoconf \ automake \ -- cgit v1.2.3 From 7fb04e34fdacad2c04422d9be533298b889bf342 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 31 Mar 2019 16:44:35 +0200 Subject: Docker: remove duplicate installation of libboost-filesystem-dev --- docker/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0b3c4594..8e9f6509 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -56,7 +56,6 @@ RUN apt-get update && apt-get install -y \ kernel-package \ libtool \ libglib2.0-dev \ - libboost-filesystem-dev \ libapt-pkg-dev \ libncurses5-dev \ flex \ -- cgit v1.2.3 From 718cff74e198133d62da26ea89b4e98de8c15ae6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 31 Mar 2019 16:44:59 +0200 Subject: Docker: cleanup package dependencies for Kernel --- docker/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8e9f6509..ebd8d56b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -53,13 +53,9 @@ RUN apt-get update && apt-get install -y \ genisoimage \ lsb-release \ fakechroot \ - kernel-package \ libtool \ libglib2.0-dev \ libapt-pkg-dev \ - libncurses5-dev \ - flex \ - bison \ libperl-dev \ libnfnetlink-dev \ parted \ @@ -121,6 +117,10 @@ RUN apt-get update && apt-get install -y \ # Packages needed for kernel RUN apt-get update && apt-get install -y \ + kernel-package \ + libncurses5-dev \ + flex \ + bison \ libelf-dev # Packages needed for vyos-accel-ppp -- cgit v1.2.3 From f3d9a912ea98018fa3390e4ff279803c58798bcd Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 31 Mar 2019 16:52:00 +0200 Subject: live-build: remove accidently added file for linux-firmware Commit 6b5da3d86615 ("Docker: remove duplicate installation of live-build") added a file by accident for fetching the linux firmware binaries. --- .../hooks/live/40-linux-firmware.chroot | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100755 data/live-build-config/hooks/live/40-linux-firmware.chroot diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot deleted file mode 100755 index 7cd51ffd..00000000 --- a/data/live-build-config/hooks/live/40-linux-firmware.chroot +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# To get the possibility of reproducible builds we pin to a specific commit -# of the linux-firmware repository -COMMIT="7bc246451318b3536d9bfd3c4e46d541a9831b33" - -echo I: Retrieving Linux Firmware (commit: ${COMMIT}) - -wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz -P /tmp -tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /lib -mv /lib/linux-firmware-${COMMIT} /lib/firmware - -# We do not need all firmware blobs .. cleanup -RM_FIRMWARE=" \ - v4l-cx* \ - s5p-mfc* \ - nvidia \ - amdgpu \ - i915 \ - radeon \ - matrox \ - mediatek \ - qed \ - sb16 \ - ti-connectivity \ - ueagle-atm \ - dvb-* \ - v4l-* \ - i915 \ - qcom \ - ctfw-* \ - ct2fw-* \ - " -for dir in ${RM_FIRMWARE}; do - rm -rf /lib/firmware/${dir} -done -- cgit v1.2.3