summaryrefslogtreecommitdiff
path: root/data/live-build-config
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-03-02 12:05:50 +0100
committerChristian Poessinger <christian@poessinger.com>2019-03-02 12:13:19 +0100
commit48664a89794f703c6934dec7ce37f33f7f58a1b1 (patch)
treeb7b8d9164008245273cc19368f02f678f2f5f1df /data/live-build-config
parent4015d118972ee4bcea20761f83c6a070699c9a0f (diff)
downloadvyos-build-48664a89794f703c6934dec7ce37f33f7f58a1b1.tar.gz
vyos-build-48664a89794f703c6934dec7ce37f33f7f58a1b1.zip
T929: remove debian-firmware packages from build
Kernel Firmware BLOBs will be delivered by the new vyos-firmware package (cherry picked from commit 3f7186f69bf9ed30d854fadc8510ccd2e9cff089)
Diffstat (limited to 'data/live-build-config')
-rwxr-xr-xdata/live-build-config/hooks/live/14-firmware-linux-nonfree.chroot12
-rwxr-xr-xdata/live-build-config/hooks/live/99-cleanup-packages.chroot14
2 files changed, 0 insertions, 26 deletions
diff --git a/data/live-build-config/hooks/live/14-firmware-linux-nonfree.chroot b/data/live-build-config/hooks/live/14-firmware-linux-nonfree.chroot
deleted file mode 100755
index 887831cc..00000000
--- a/data/live-build-config/hooks/live/14-firmware-linux-nonfree.chroot
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-cp /etc/apt/sources.list /etc/apt/sources.list.d/non-free.list
-sed -i 's/main/non-free/g' /etc/apt/sources.list.d/non-free.list
-
-if [ -e /etc/apt/sources.list.d/zz-sources.list ] ; then
- cp /etc/apt/sources.list /etc/apt/sources.list.d/zz-non-free.list
- sed -i 's/main/non-free/g' /etc/apt/sources.list.d/zz-non-free.list
-fi
-
-apt-get update
-apt-get -y install firmware-linux-nonfree
diff --git a/data/live-build-config/hooks/live/99-cleanup-packages.chroot b/data/live-build-config/hooks/live/99-cleanup-packages.chroot
deleted file mode 100755
index 63be7df6..00000000
--- a/data/live-build-config/hooks/live/99-cleanup-packages.chroot
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Clean up packages that were installed for dependencies but are no longer needed
-# and packages installed by metapackages that we'll never need
-
-UNWANTED_PKGS="dahdi-firmware-nonfree \
- firmware-crystalhd firmware-ivtv \
- firmware-samsung"
-
-for p in $UNWANTED_PKGS; do
- apt-get -y remove $p
-done
-
-#apt-get -y autoremove