From c1f52da115f36a7ba4dcf2468410aac0add0c599 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 29 Jul 2016 11:57:13 +0200 Subject: [PATCH] Revert "Missing firmware and a bugfix on firmware package creation" This reverts commit 51267b66d61dad8842f39b87d70f8f72c2b60450. --- configuration.sh | 3 +-- extras/firmware.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configuration.sh b/configuration.sh index f00c42d04..30ed13a1e 100644 --- a/configuration.sh +++ b/configuration.sh @@ -100,8 +100,7 @@ esac PACKAGE_LIST="bash-completion bc bridge-utils build-essential cpufrequtils device-tree-compiler dosfstools figlet \ fbset fping git hostapd ifenslave-2.6 iw lirc fake-hwclock wpasupplicant psmisc ntp parted rsync sudo curl \ dialog crda wireless-regdb ncurses-term python3-apt sysfsutils toilet u-boot-tools unattended-upgrades \ - unzip usbutils wireless-tools console-setup console-data console-common unicode-data openssh-server \ - initramfs-tools ca-certificates firmware-realtek firmware-ralink" + unzip usbutils wireless-tools console-setup console-data console-common unicode-data openssh-server initramfs-tools ca-certificates" # development related packages. remove when they are not needed for building packages in chroot PACKAGE_LIST="$PACKAGE_LIST automake cmake libwrap0-dev libssl-dev libtool pkg-config libusb-dev libusb-1.0-0-dev libnl-3-dev libnl-genl-3-dev" diff --git a/extras/firmware.sh b/extras/firmware.sh index fce59e5b9..7ce085b84 100644 --- a/extras/firmware.sh +++ b/extras/firmware.sh @@ -20,7 +20,7 @@ build_firmware() cp -R $SRC/lib/bin/firmware-overlay/* $SOURCES/$plugin_dir/lib/firmware # cleanup what's not needed for sure - rm -rf $SOURCES/$plugin_dir/lib/firmware/{amdgpu,amd-ucode,radeon,nvidia} + rm -rf $plugin_dir/lib/firmware/{amdgpu,amd-ucode,radeon,nvidia} cd $SOURCES/$plugin_dir # set up control file