Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

create linux-libc-dev when building kernel packages #6408

Merged
merged 3 commits into from
Mar 25, 2024
Merged

create linux-libc-dev when building kernel packages #6408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44da77e
Re-add functionality to create linux-libc-dev when building kernel pa…
vali-um Mar 18, 2024
050e7bc
Merge branch 'main' into main
vali-um Mar 19, 2024
1178756
linux-libc-dev: append -${BRANCH}-${LINUXFAMILY} to package name and …
vali-um Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/functions/artifacts/artifact-kernel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ function artifact_kernel_prepare_version() {
artifact_map_packages+=(["linux-dtb"]="linux-dtb-${BRANCH}-${LINUXFAMILY}")
fi

artifact_map_packages+=(["linux-libc-dev"]="linux-libc-dev-${BRANCH}-${LINUXFAMILY}")

artifact_name="kernel-${LINUXFAMILY}-${BRANCH}" # default name of regular artifact

# Separate artifact name if we're in DTB-only mode, so stuff doesn't get mixed up later
Expand Down
29 changes: 29 additions & 0 deletions lib/functions/compilation/kernel-debs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ function prepare_kernel_packaging_debs() {
display_alert "Skipping linux-headers package" "for ${KERNEL_MAJOR_MINOR} kernel version" "info"
fi
fi

display_alert "Packaging linux-libc-dev" "${LINUXFAMILY} ${LINUXCONFIG}" "info"
create_kernel_deb "linux-libc-dev-${BRANCH}-${LINUXFAMILY}" "${debs_target_dir}" kernel_package_callback_linux_libc_dev "linux-libc-dev"
}

function create_kernel_deb() {
Expand Down Expand Up @@ -531,3 +534,29 @@ function kernel_package_callback_linux_headers() {
EOT_POSTINST_FINISH
)
}


function kernel_package_callback_linux_libc_dev() {
display_alert "linux-libc-dev packaging" "${package_directory}" "debug"

mkdir -p "${package_directory}/usr"
run_host_command_logged cp -rp "${tmp_kernel_install_dirs[INSTALL_HDR_PATH]}/include" "${package_directory}/usr"
HOST_ARCH=$(dpkg-architecture -a${ARCH} -q"DEB_HOST_MULTIARCH")
run_host_command_logged mkdir "${package_directory}/usr/include/${HOST_ARCH}"
run_host_command_logged mv "${package_directory}/usr/include/asm" "${package_directory}/usr/include/${HOST_ARCH}"

# Generate a control file
cat <<- CONTROL_FILE > "${package_DEBIAN_dir}/control"
Version: ${artifact_version}
Maintainer: ${MAINTAINER} <${MAINTAINERMAIL}>
Package: ${package_name}
Section: devel
Priority: optional
Provides: linux-libc-dev
Architecture: ${ARCH}
Description: Armbian Linux support headers for userspace development
This package provides userspaces headers from the Linux kernel. These headers
are used by the installed headers for GNU glibc and other system libraries.
Multi-Arch: same
CONTROL_FILE
}
5 changes: 3 additions & 2 deletions lib/functions/compilation/kernel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ function kernel_prepare_build_and_package() {
declare -A kernel_install_dirs=(
["INSTALL_PATH"]="${kernel_dest_install_dir}/image/boot" # Used by `make install`
["INSTALL_MOD_PATH"]="${kernel_dest_install_dir}/modules" # Used by `make modules_install`
#["INSTALL_HDR_PATH"]="${kernel_dest_install_dir}/libc_headers" # Used by `make headers_install` - disabled, only used for libc headers
["INSTALL_HDR_PATH"]="${kernel_dest_install_dir}/libc_headers" # Used by `make headers_install` for libc headers
)

[ -z "${SRC_LOADADDR}" ] || install_make_params_quoted+=("${SRC_LOADADDR}") # For uImage
Expand All @@ -133,7 +133,8 @@ function kernel_prepare_build_and_package() {

install_make_params_quoted+=("INSTALL_MOD_STRIP=1") # strip modules during install

build_targets+=("modules_install") # headers_install disabled, only used for libc headers
build_targets+=("modules_install")
build_targets+=("headers_install") # headers_install for libc headers
if [[ "${KERNEL_BUILD_DTBS:-yes}" == "yes" ]]; then
display_alert "Kernel build will produce DTBs!" "DTBs YES" "debug"
build_targets+=("dtbs_install")
Expand Down