diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 0f4f714..35e16b5 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -39,6 +39,8 @@ ARG OS_REPO=rancher ARG KERNEL_TAG ARG KERNEL_VERSION=${KERNEL_TAG}-${OS_REPO} +ARG FIRMWARE_TAG=20190514 + ENV OS_REPO=${OS_REPO} \ DOCKER_URL=DOCKER_URL_${ARCH} \ DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \ @@ -48,6 +50,7 @@ ENV OS_REPO=${OS_REPO} \ KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/ \ KERNEL_TAR=linux-${KERNEL_TAG}.tar.xz \ KERNEL_SIGN=linux-${KERNEL_TAG}.tar.sign \ + FIRMWARE_TAG=${FIRMWARE_TAG} \ KERNEL_ARCH=x86 # for rc testing #ENV KERNEL_URL=https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-${KERNEL_TAG}.tar.xz diff --git a/firmware/x86/firmware b/firmware/x86/firmware index d7f6c16..45c20d1 100644 --- a/firmware/x86/firmware +++ b/firmware/x86/firmware @@ -60,5 +60,5 @@ iwlwifi-7260-17.ucode iwlwifi-7265D-29.ucode iwlwifi-8000C-36.ucode iwlwifi-8265-36.ucode -iwlwifi-9000-pu-b0-jf-b0-43.ucode -iwlwifi-9260-th-b0-jf-b0-43.ucode +iwlwifi-9000-pu-b0-jf-b0-46.ucode +iwlwifi-9260-th-b0-jf-b0-46.ucode diff --git a/scripts/build-common b/scripts/build-common index b48cf5c..2e21a4e 100755 --- a/scripts/build-common +++ b/scripts/build-common @@ -33,6 +33,9 @@ create_firmware_tar() { if [ ! -e linux-firmware ]; then git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git + pushd linux-firmware + git checkout -b ${FIRMWARE_TAG} ${FIRMWARE_TAG} + popd fi ( diff --git a/scripts/test-firmware b/scripts/test-firmware index f954ea0..2d8f94e 100755 --- a/scripts/test-firmware +++ b/scripts/test-firmware @@ -8,6 +8,9 @@ echo "FIRMWARE test: $FIRMWARE" if [ ! -e linux-firmware ]; then git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git + pushd linux-firmware + git checkout -b ${FIRMWARE_TAG} ${FIRMWARE_TAG} + popd fi cd linux-firmware