From patchwork Tue Jul 16 17:52:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13734728 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DECD91A2542; Tue, 16 Jul 2024 17:52:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721152346; cv=none; b=LWGdeaXBoHOWn4so4BnW7bxN1C3RB0UGdVKdW+YBnJRZQwxe5pF68Ct16+jS+0hjjrxo9ZOt6xPGFJBeMZrMsGk1Bb9+OLTTGN/NA6datXYXzUxXR8WEEjQ5bMN+OFg565L3aJ4hQaoytCmOtayDmrYbuJmPPVuv6vNrG3Sd0XU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721152346; c=relaxed/simple; bh=NF4irKtWl2lb9TbzINPEXipLVAN69ZDlRR7+zs8n10k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=DQW1Y2m7Ax7KxYyzE4L/PF+mfoOauJ19Tm0WAUbHC2s8An8dvviEW8AaPI8A6krQ+A5eb9tdl7Bwq9kg9bt9w5TUDg/GbYpqp5dj6zmHOGbRXAedX7b26LkNPQ/uHzr4W4jNIfkaHFYqhIZKmqtYbUoXff4Q23Py4b8QEFvj7ag= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=dXeYfdkb; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="dXeYfdkb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1721152339; bh=NF4irKtWl2lb9TbzINPEXipLVAN69ZDlRR7+zs8n10k=; h=From:Date:Subject:To:Cc:From; b=dXeYfdkbbvd5pUq+vLWkDZ31dkL4zW5FGhSAo0Ug6MDZQMWNOxh0BhCrU71P+t/ks 3iUMw78R40m/qgEHAMIgsAa83DZsOOTXlyPlgxDcmEEjQYcVwi1eUMCqNMLl9HTNP2 7rrohqoGOogr3Pa9v3ILeUhVtfh1nLnxMJuAGxHo= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Tue, 16 Jul 2024 19:52:14 +0200 Subject: [PATCH v6] kbuild: add script and target to generate pacman package Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240716-kbuild-pacman-pkg-v6-1-d3a04e308013@weissschuh.net> X-B4-Tracking: v=1; b=H4sIAE2zlmYC/23QTW7CMBAF4Ksgr2s0Hv+mq96j6sLj2MSiDVEMa RHK3TGwiVQv30jzvdHcWIlzjoW9725sjksu+TTWYN52LAx+PESe+5oZAiowqPmRLvm755MPP37 k0/HASSVno+h6kIbVvWmOKf89zc+vmodczqf5+qxYxGP60iyohrYILrgPmIxMOnlLH78xl1LCc Bn2YzyzB7ngljEtBitjhFSIHqS3vsnILeNajKyMc7pPMlCwCpqM2jACWoyqjAZLpMl2hO1r9JZ p/kZXBnTnlAEKnXD/mHVd798/He3TAQAA To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier Cc: "Jan Alexander Steffens (heftig)" , linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, =?utf-8?q?Thom?= =?utf-8?q?as_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1721152339; l=8299; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=NF4irKtWl2lb9TbzINPEXipLVAN69ZDlRR7+zs8n10k=; b=J6R6TYEapvirTHgwWX2/F3FJ8TJqFOwAZB4vL5/ODFBoQjLNCi350zZQbfiWYc3NTnx9I8fP6 em52E8ykJRHCnkfm68cuW4jqYsLccKGAxhXm/AJEQkSWi/AgBQVYdD7 X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= pacman is the package manager used by Arch Linux and its derivates. Creating native packages from the kernel tree has multiple advantages: * The package triggers the correct hooks for initramfs generation and bootloader configuration * Uninstallation is complete and also invokes the relevant hooks * New UAPI headers can be installed without any manual bookkeeping The PKGBUILD file is a simplified version of the one used for the downstream Arch Linux "linux" package. Extra steps that should not be necessary for a development kernel have been removed and an UAPI header package has been added. Signed-off-by: Thomas Weißschuh Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Reviewed-by: Nicolas Schier --- Changes in v6: - Drop reference to srctree/Makefile - Drop $(realpath $(srctree)) - Make use of the fact that $(objtree) is always "." - Align coding style to kernel and drop vim config line - Drop indirection through `$MAKE run-command` - Unify shell variable syntax to "${var}" - Add explanations to custom variables - Add makedepends - Link to v5: https://lore.kernel.org/r/20240714-kbuild-pacman-pkg-v5-1-0598460bc918@weissschuh.net Changes in v5: - Rebase onto kbuild/for-next - Use new path to build-version script (from kbuild/for-next) - Ensure submake jobserver delegation works - Simplify $modulesdir/pkgbase file creation - Add Reviewed-by from Nicolas - Link to v4: https://lore.kernel.org/r/20240710-kbuild-pacman-pkg-v4-1-507bb5b79b2a@weissschuh.net Changes in v4: - Update MRPROPER_FILES - Unify shell variable syntax - Link to v3: https://lore.kernel.org/r/20240708-kbuild-pacman-pkg-v3-1-885df3cbc740@weissschuh.net Changes in v3: - Enforce matching architectures for installation - Add Reviewed-by and Tested-by from Nathan - Link to v2: https://lore.kernel.org/r/20240706-kbuild-pacman-pkg-v2-1-613422a03a7a@weissschuh.net Changes in v2: - Replace ${MAKE} with $MAKE for consistency with other variables - Use $MAKE for "-s image_name" - Avoid permission warnings from build directory - Clarify reason for /build symlink removal - Install System.map and config - Install dtbs where available - Allow cross-build through arch=any - Sort Contributor/Maintainer chronologically - Disable some unneeded makepkg options - Use DEPMOD=true for consistency with rpm-package - Link to v1: https://lore.kernel.org/r/20240704-kbuild-pacman-pkg-v1-1-ac2f63f5fa7b@weissschuh.net --- .gitignore | 6 +++ Makefile | 2 +- scripts/Makefile.package | 14 +++++++ scripts/package/PKGBUILD | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 1 deletion(-) --- base-commit: 818e9c998b04d6c69a510d5255a93d0e3b8d4993 change-id: 20240625-kbuild-pacman-pkg-b4f87e19d036 Best regards, diff --git a/.gitignore b/.gitignore index c59dc60ba62e..7902adf4f7f1 100644 --- a/.gitignore +++ b/.gitignore @@ -92,6 +92,12 @@ modules.order # /tar-install/ +# +# pacman files (make pacman-pkg) +# +/PKGBUILD +/pacman/ + # # We don't want to ignore the following even if they are dot-files # diff --git a/Makefile b/Makefile index 7372ea45ed3f..768d3dc107f8 100644 --- a/Makefile +++ b/Makefile @@ -1481,7 +1481,7 @@ CLEAN_FILES += vmlinux.symvers modules-only.symvers \ # Directories & files removed with 'make mrproper' MRPROPER_FILES += include/config include/generated \ arch/$(SRCARCH)/include/generated .objdiff \ - debian snap tar-install \ + debian snap tar-install PKGBUILD pacman \ .config .config.old .version \ Module.symvers \ certs/signing_key.pem \ diff --git a/scripts/Makefile.package b/scripts/Makefile.package index bf016af8bf8a..0aaa0832279c 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -141,6 +141,19 @@ snap-pkg: cd $(objtree)/snap && \ snapcraft --target-arch=$(UTS_MACHINE) +# pacman-pkg +# --------------------------------------------------------------------------- + +PHONY += pacman-pkg +pacman-pkg: + @ln -srf $(srctree)/scripts/package/PKGBUILD $(objtree)/PKGBUILD + +objtree="$(realpath $(objtree))" \ + BUILDDIR=pacman \ + CARCH="$(UTS_MACHINE)" \ + KBUILD_MAKEFLAGS="$(MAKEFLAGS)" \ + KBUILD_REVISION="$(shell $(srctree)/scripts/build-version)" \ + makepkg + # dir-pkg tar*-pkg - tarball targets # --------------------------------------------------------------------------- @@ -221,6 +234,7 @@ help: @echo ' bindeb-pkg - Build only the binary kernel deb package' @echo ' snap-pkg - Build only the binary kernel snap package' @echo ' (will connect to external hosts)' + @echo ' pacman-pkg - Build only the binary kernel pacman package' @echo ' dir-pkg - Build the kernel as a plain directory structure' @echo ' tar-pkg - Build the kernel as an uncompressed tarball' @echo ' targz-pkg - Build the kernel as a gzip compressed tarball' diff --git a/scripts/package/PKGBUILD b/scripts/package/PKGBUILD new file mode 100644 index 000000000000..eb3957fad915 --- /dev/null +++ b/scripts/package/PKGBUILD @@ -0,0 +1,99 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Maintainer: Thomas Weißschuh +# Contributor: Jan Alexander Steffens (heftig) + +pkgbase=linux-upstream +pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-api-headers") +pkgver="${KERNELRELEASE//-/_}" +# The PKGBUILD is evaluated multiple times. +# Running scripts/build-version from here would introduce inconsistencies. +pkgrel="${KBUILD_REVISION}" +pkgdesc='Linux' +url='https://www.kernel.org/' +# Enable flexible cross-compilation +arch=(${CARCH}) +license=(GPL-2.0-only) +makedepends=( + base-devel + bc + cpio + gettext + libelf + openssl + pahole + perl + python + rsync + tar +) +options=(!debug !strip !buildflags !makeflags) + +build() { + # MAKEFLAGS from makepkg.conf override the ones inherited from kbuild. + # Bypass this override with a custom variable. + export MAKEFLAGS="${KBUILD_MAKEFLAGS}" + cd "${objtree}" + + # makepkg does a "chmod a-srw", triggering warnings during kbuild + chmod 0755 "${pkgdirbase}" || true + + ${MAKE} +} + +package_linux-upstream() { + pkgdesc="The ${pkgdesc} kernel and modules" + + export MAKEFLAGS="${KBUILD_MAKEFLAGS}" + cd "${objtree}" + local modulesdir="${pkgdir}/usr/${MODLIB}" + + echo "Installing boot image..." + # systemd expects to find the kernel here to allow hibernation + # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 + install -Dm644 "$(${MAKE} -s image_name)" "${modulesdir}/vmlinuz" + + # Used by mkinitcpio to name the kernel + echo "${pkgbase}" > "${modulesdir}/pkgbase" + + echo "Installing modules..." + ${MAKE} INSTALL_MOD_PATH="${pkgdir}/usr" INSTALL_MOD_STRIP=1 \ + DEPMOD=true modules_install + + if [ -d "${srctree}/arch/${SRCARCH}/boot/dts" ]; then + echo "Installing dtbs..." + ${MAKE} INSTALL_DTBS_PATH="${modulesdir}/dtb" dtbs_install + fi + + # remove build link, will be part of -headers package + rm -f "${modulesdir}/build" +} + +package_linux-upstream-headers() { + pkgdesc="Headers and scripts for building modules for the ${pkgdesc} kernel" + + export MAKEFLAGS="${KBUILD_MAKEFLAGS}" + cd "${objtree}" + local builddir="${pkgdir}/usr/${MODLIB}/build" + + echo "Installing build files..." + "${srctree}/scripts/package/install-extmod-build" "${builddir}" + + echo "Installing System.map and config..." + cp System.map "${builddir}/System.map" + cp .config "${builddir}/.config" + + echo "Adding symlink..." + mkdir -p "${pkgdir}/usr/src" + ln -sr "${builddir}" "${pkgdir}/usr/src/${pkgbase}" +} + +package_linux-upstream-api-headers() { + pkgdesc="Kernel headers sanitized for use in userspace" + provides=(linux-api-headers) + conflicts=(linux-api-headers) + + export MAKEFLAGS="${KBUILD_MAKEFLAGS}" + cd "${objtree}" + + ${MAKE} headers_install INSTALL_HDR_PATH="${pkgdir}/usr" +}