From 43180ccf88adcc8ef9d04ecee09ce0a638fbbf66 Mon Sep 17 00:00:00 2001 From: Giulio Date: Thu, 13 Aug 2020 09:52:15 +0200 Subject: [PATCH] Main changes: kernel switched to mainline, added build options for broadcom driver, added non-free repository, added wifi firmware package --- filesystem/resources/apt/sources.list | 4 +- filesystem/resources/apt/updates.list | 8 ++-- kernel/makefile | 20 +++++---- kernel/resources/config | 41 +++++++++++++++++++ .../linux-libre-5.4.29-gnu.tar.lz.sign | 6 --- makefile | 2 +- .../ImageScripts/installKernelToFs.sh | 2 +- scripts/InstallScripts/FlashKernelPart.sh | 2 +- scripts/Shared/package_lists.sh | 1 + 9 files changed, 64 insertions(+), 22 deletions(-) delete mode 100644 kernel/sources/linux-libre-5.4.29-gnu.tar.lz.sign diff --git a/filesystem/resources/apt/sources.list b/filesystem/resources/apt/sources.list index b22ba5a..cf900ad 100644 --- a/filesystem/resources/apt/sources.list +++ b/filesystem/resources/apt/sources.list @@ -1,2 +1,2 @@ -deb http://ftp.us.debian.org/debian suite main -deb-src http://ftp.us.debian.org/debian suite main +deb http://ftp.us.debian.org/debian suite main non-free +deb-src http://ftp.us.debian.org/debian suite main non-free diff --git a/filesystem/resources/apt/updates.list b/filesystem/resources/apt/updates.list index 6058fd6..d4e1bf7 100644 --- a/filesystem/resources/apt/updates.list +++ b/filesystem/resources/apt/updates.list @@ -1,6 +1,6 @@ -deb http://ftp.us.debian.org/debian suite-updates main -deb-src http://ftp.us.debian.org/debian suite-updates main +deb http://ftp.us.debian.org/debian suite-updates main non-free +deb-src http://ftp.us.debian.org/debian suite-updates main non-free -deb http://security.debian.org/debian-security/ suite/updates main -deb-src http://security.debian.org/debian-security/ suite/updates main +deb http://security.debian.org/debian-security/ suite/updates main non-free +deb-src http://security.debian.org/debian-security/ suite/updates main non-free diff --git a/kernel/makefile b/kernel/makefile index 7865c18..97c3b75 100644 --- a/kernel/makefile +++ b/kernel/makefile @@ -13,8 +13,9 @@ KERNEL_RESOURCES := $(PRAWNOS_KERNEL)/resources KERNEL_SOURCES := $(PRAWNOS_KERNEL)/sources KERNEL_PATCHES := $(PRAWNOS_KERNEL)/patches -KERNEL_TAR := $(KERNEL_SOURCES)/linux-libre-$(KVER)-gnu.tar.lz -KERNEL_TAR_SIGNATURE := $(KERNEL_TAR).sign +KERNEL_TAR_XZ := $(KERNEL_SOURCES)/linux-$(KVER).tar.xz +KERNEL_TAR := $(KERNEL_SOURCES)/linux-$(KVER).tar +KERNEL_TAR_SIGNATURE := $(KERNEL_SOURCES)/linux-$(KVER).tar.sign KERNEL_BUILT := $(PRAWNOS_KERNEL_BUILD)/vmlinux.kpart KERNEL_BUILD_LOG := $(PRAWNOS_BUILD_LOGS)/kernel-log.txt @@ -64,15 +65,20 @@ update_ath9k_tar: .PHONY: update_kernel_sig update_kernel_sig: - wget https://www.linux-libre.fsfla.org/pub/linux-libre/releases/$(KVER)-gnu/linux-libre-$(KVER)-gnu.tar.lz.sign -O $(KERNEL_TAR_SIGNATURE) + wget https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-$(KVER).tar.sign -O $(KERNEL_TAR_SIGNATURE) + #wget https://www.linux-libre.fsfla.org/pub/linux-libre/releases/$(KVER)-gnu/linux-libre-$(KVER)-gnu.tar.lz.sign -O $(KERNEL_TAR_SIGNATURE) ### REAL TARGETS $(KERNEL_EXTRACTED): $(PRAWNOS_BUILD) - wget https://www.linux-libre.fsfla.org/pub/linux-libre/releases/$(KVER)-gnu/linux-libre-$(KVER)-gnu.tar.lz -O $(KERNEL_TAR) - gpg --import $(KERNEL_RESOURCES)/linux-libre-signing-key.gpg - gpg --verify $(KERNEL_TAR_SIGNATURE) $(KERNEL_TAR) - tar --lzip -xvf $(KERNEL_TAR) -C $(PRAWNOS_BUILD) + wget https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-$(KVER).tar.xz -O $(KERNEL_TAR_XZ) + wget https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-$(KVER).tar.sign -O $(KERNEL_TAR_SIGNATURE) + unxz --force $(KERNEL_TAR_XZ) + #wget https://www.linux-libre.fsfla.org/pub/linux-libre/releases/$(KVER)-gnu/linux-libre-$(KVER)-gnu.tar.lz -O $(KERNEL_TAR) + gpg2 --recv-keys 0x647F28654894E3BD457199BE38DBBDC86092693E 0xABAF11C65A2970B130ABE3C479BE3E4300411886 + #gpg2 --import $(KERNEL_RESOURCES)/linux-libre-signing-key.gpg + gpg2 --verify $(KERNEL_TAR_SIGNATURE) $(KERNEL_TAR) + tar -xvf $(KERNEL_TAR) -C $(PRAWNOS_BUILD) touch $(KERNEL_EXTRACTED) $(ATH9K_EXTRACTED): $(PRAWNOS_BUILD) diff --git a/kernel/resources/config b/kernel/resources/config index fe18d3f..bdee255 100644 --- a/kernel/resources/config +++ b/kernel/resources/config @@ -5743,3 +5743,44 @@ CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" # CONFIG_PID_IN_CONTEXTIDR is not set # CONFIG_CORESIGHT is not set # end of Kernel hacking + + +CONFIG_WLAN_VENDOR_BROADCOM=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y +CONFIG_B43_BUSES_BCMA_AND_SSB=y +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_G=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=y +CONFIG_B43_LEDS=y +CONFIG_B43_HWRNG=y +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_LEDS=y +CONFIG_B43LEGACY_HWRNG=y +CONFIG_B43LEGACY_DEBUG=n +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_PROTO_BCDC=y +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_SDIO=y +CONFIG_BRCMFMAC_USB=y +CONFIG_BRCMFMAC_PCIE=y +CONFIG_BRCM_TRACING=n +CONFIG_BRCMDBG=n diff --git a/kernel/sources/linux-libre-5.4.29-gnu.tar.lz.sign b/kernel/sources/linux-libre-5.4.29-gnu.tar.lz.sign deleted file mode 100644 index 63597bc..0000000 --- a/kernel/sources/linux-libre-5.4.29-gnu.tar.lz.sign +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCXoTtgwAKCRC8t8+Hfn1H -p2pMAJ9TOa8OApUkdNhvtzCJ2I4GsQKgvQCfUS/zeXS7D7tY0zTG3iQZkaCC0M8= -=K67B ------END PGP SIGNATURE----- diff --git a/makefile b/makefile index ac42abf..8fee4e7 100644 --- a/makefile +++ b/makefile @@ -49,7 +49,7 @@ clean_pbuilder: rm -r build/prawnos-pbuilder-armhf-base.tgz .PHONY: clean_all -clean_all: clean_kernel clean_initramfs clean_ath9k clean_image clean_basefs clean_pbuilder +clean_all: clean_kernel clean_ath9k clean_image clean_basefs clean_pbuilder #:::::::::::::::::::::::::::::: premake prep :::::::::::::::::::::::::::::: .PHONY: build_dirs diff --git a/scripts/BuildScripts/ImageScripts/installKernelToFs.sh b/scripts/BuildScripts/ImageScripts/installKernelToFs.sh index e090452..b002acd 100755 --- a/scripts/BuildScripts/ImageScripts/installKernelToFs.sh +++ b/scripts/BuildScripts/ImageScripts/installKernelToFs.sh @@ -68,7 +68,7 @@ kernel_size=65536 dd if=/dev/zero of=${outdev}p1 conv=notrunc bs=512 count=$kernel_size #now write the new kernel dd if=build/linux-$KVER/vmlinux.kpart of=${outdev}p1 conv=notrunc -make -C build/linux-$KVER ARCH=arm INSTALL_MOD_PATH=$outmnt modules_install +make -C build/linux-$KVER ARCH=arm INSTALL_MOD_PATH=$outmnt INSTALL_HEADERS_PATH=$outmnt headers_install modules_install # the ath9k firmware is built into the kernel image, so nothing else must be done diff --git a/scripts/InstallScripts/FlashKernelPart.sh b/scripts/InstallScripts/FlashKernelPart.sh index 6af6be8..f1cc325 100755 --- a/scripts/InstallScripts/FlashKernelPart.sh +++ b/scripts/InstallScripts/FlashKernelPart.sh @@ -147,4 +147,4 @@ It's now safe to reboot." # TODO: install modules. ----------------------------------- # Right now, there's no easy way to do that on the running machine # ----------------------------------------------------------------- -# make -C build/linux-$KVER ARCH=arm INSTALL_MOD_PATH=$outmnt modules_install +# make -C build/linux-$KVER ARCH=arm INSTALL_MOD_PATH=$outmnt INSTALL_HEADERS_PATH=$outmnt headers_install modules_install diff --git a/scripts/Shared/package_lists.sh b/scripts/Shared/package_lists.sh index a9244be..5cabc30 100755 --- a/scripts/Shared/package_lists.sh +++ b/scripts/Shared/package_lists.sh @@ -38,6 +38,7 @@ base_debs_install=( cgpt cryptsetup e2fsprogs-l10n + firmware-brcm80211 gdisk git ifupdown