Skip to content
This repository has been archived by the owner on Mar 25, 2024. It is now read-only.

Commit

Permalink
focal: fixed the build
Browse files Browse the repository at this point in the history
- Ubuntu Focal/LTS 5.4.0-29.33
- Linux Firmware 1.187
  • Loading branch information
dweomer committed May 14, 2020
1 parent 4a09325 commit 9a03058
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
12 changes: 9 additions & 3 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG DOWNLOADS=/usr/src/downloads
FROM ${UBUNTU} AS ubuntu
ARG DOWNLOADS
ARG LINUX_FIRMWARE=linux-firmware=1.187
ARG LINUX_SOURCE=linux-source-5.4.0=5.4.0-21.25
ARG LINUX_SOURCE=linux-source-5.4.0=5.4.0-29.33
ENV DEBIAN_FRONTEND=noninteractive
RUN set -x \
&& apt-get --assume-yes update \
Expand All @@ -20,7 +20,7 @@ FROM ${BUILD}
ARG DOWNLOADS
COPY --from=ubuntu ${DOWNLOADS}/ ${DOWNLOADS}/
RUN apt-get --assume-yes update \
&& apt-get --assume-yes install \
&& apt-get --assume-yes install --no-install-recommends --upgrade \
bc \
bison \
ccache \
Expand All @@ -33,11 +33,15 @@ RUN apt-get --assume-yes update \
gnupg2 \
kernel-wedge \
kmod \
less \
libelf-dev \
libiberty-dev \
liblz4-tool \
libncurses-dev \
libpci-dev \
libssl-dev \
libudev-dev \
linux-libc-dev \
locales \
rsync \
vim \
Expand All @@ -50,7 +54,9 @@ ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_SOURCE /source
ENV DAPPER_OUTPUT ./dist ./build
ENV DAPPER_RUN_ARGS --privileged
ENV SHELL /bin/bash
ENV EDITOR=vim \
PAGER=less \
SHELL=/bin/bash
WORKDIR ${DAPPER_SOURCE}

########## General Configuration #####################
Expand Down
4 changes: 3 additions & 1 deletion scripts/build
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ KERNEL_DIR=build/kernel

# some hacking
mkdir -p ${KERNEL_DIR}/debian/stamps
chmod -R +x ${KERNEL_DIR}/debian/scripts
chmod a+x ${KERNEL_DIR}/debian*/scripts/*
chmod a+x ${KERNEL_DIR}/debian*/scripts/misc/*

# kernel
pushd ${KERNEL_DIR}
unset -v ARCH KERNEL_DIR
debian/rules clean
# see https://wiki.ubuntu.com/KernelTeam/KernelMaintenance#Overriding_module_check_failures
for abi in $(find . -mindepth 1 -maxdepth 2 -type d -name abi); do
Expand Down
12 changes: 6 additions & 6 deletions scripts/package
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ GENERIC_EXTRA_DIR=dist/generic/modules-extra
mkdir -p ${GENERIC_HEADERS_DIR} ${GENERIC_MAIN_DIR} ${GENERIC_EXTRA_DIR}

# headers
dpkg-deb -x build/linux-headers-5.*.deb ${GENERIC_HEADERS_DIR}/
#dpkg-deb -x build/linux-hwe-5.*-headers-*.deb ${GENERIC_HEADERS_DIR}/
sh -xc "dpkg-deb -x build/linux-headers-5.*generic*.deb ${GENERIC_HEADERS_DIR}/"
sh -xc "dpkg-deb -x build/linux-headers-5.*all.deb ${GENERIC_HEADERS_DIR}/"

# main modules and vmlinuz and firmware
dpkg-deb -x build/linux-image-unsigned-5.*.deb ${GENERIC_MAIN_DIR}
dpkg-deb -x build/linux-modules-5.*.deb ${GENERIC_MAIN_DIR}
dpkg-deb -x ${DOWNLOADS}/ubuntu-firmware.deb ${GENERIC_MAIN_DIR}
sh -xc "dpkg-deb -x build/linux-image-unsigned-5.*.deb ${GENERIC_MAIN_DIR}"
sh -xc "dpkg-deb -x build/linux-modules-5.*.deb ${GENERIC_MAIN_DIR}"
sh -xc "dpkg-deb -x ${DOWNLOADS}/ubuntu-firmware.deb ${GENERIC_MAIN_DIR}"

# extra modules
dpkg-deb -x build/linux-modules-extra-5.*.deb ${GENERIC_EXTRA_DIR}
sh -xc "dpkg-deb -x build/linux-modules-extra-5.*.deb ${GENERIC_EXTRA_DIR}"

# package artifacts
mkdir -p dist/artifacts
Expand Down

0 comments on commit 9a03058

Please sign in to comment.