From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] linux5.11: try to build scripts/ for cross targets.
Date: Fri, 02 Apr 2021 17:41:54 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29952@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1752 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages linux5.11
https://github.com/void-linux/void-packages/pull/29952
linux5.11: try to build scripts/ for cross targets.
Since we are here, clean up unused args and add a few comments.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
[ci skip]
Relevant for DKMS modules on cross archs, like aarch64.
A patch file from https://github.com/void-linux/void-packages/pull/29952.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux5.11-29952.patch --]
[-- Type: text/x-diff, Size: 3142 bytes --]
From 40e61ff638caa3a89e05294c95e61c2f19a4d8bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 2 Apr 2021 12:40:01 -0300
Subject: [PATCH] linux5.11: try to build scripts/ for cross targets.
Since we are here, clean up unused args and add a few comments.
---
srcpkgs/linux5.11/template | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index a75cd56b0de8..e8a56959c806 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -3,6 +3,7 @@ pkgname=linux5.11
version=5.11.11
revision=1
wrksrc="linux-${version%.*}"
+build_helper=qemu
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-only"
@@ -26,6 +27,7 @@ preserve=yes
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
openssl-devel perl uboot-mkimage cpio pahole python3"
+makedepends="elfutils-devel openssl-devel"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
@@ -52,9 +54,6 @@ export KBUILD_BUILD_HOST=voidlinux
if [ "$CROSS_BUILD" ]; then
_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
fi
-if [ "${_patchver}" ]; then
- _version="EXTRAVERSION=${_patchver}"
-fi
pre_patch() {
xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1
@@ -85,13 +84,6 @@ do_configure() {
msg_normal "Detected a .config file for your arch, using it.\n"
cp -f ${FILESDIR}/${subarch:-$arch}-dotconfig .config
make ${makejobs} ARCH=$arch ${_cross} oldconfig
- elif [ -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig ]; then
- msg_normal "Detected a .config file for your cpu family, using it.\n"
- cp -f ${FILESDIR}/${XBPS_TARGET_MACHINE%%-musl}-dotconfig .config
- make ${makejobs} ARCH=$arch ${_cross} oldconfig
- else
- msg_normal "Defaulting to 'allmodconfig'.\n"
- make ${makejobs} ARCH=$arch ${_cross} allmodconfig
fi
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
@@ -109,8 +101,8 @@ do_build() {
mips*) _args="uImage modules dtbs"; arch=mips;;
esac
export LDFLAGS=
- make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
- make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+ make ARCH=$arch ${_cross} ${makejobs} prepare
+ make ARCH=$arch ${_cross} ${makejobs} ${_args}
}
do_install() {
@@ -125,7 +117,7 @@ do_install() {
mips*) arch=mips;;
esac
- # Run depmod after compressing modules.
+ # Run depmod after compressing modules - makes depmod.sh a noop
sed -i '2iexit 0' scripts/depmod.sh
# Install kernel, firmware and modules
@@ -203,6 +195,9 @@ do_install() {
make ${makejobs} ARCH=${subarch:-$arch} ${_cross} _mrproper_scripts
# remove host specific objects as well
find scripts -name '*.o' -delete
+ : make ${makejobs} ARCH=${subarch:-$arch} CC=$CC scripts
+ # TODO: this fails because it tries to run fixdep
+ # idea: use qemu?
fi
# Copy files necessary for later builds, like nvidia and vmware
next reply other threads:[~2021-04-02 15:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-02 15:41 ericonr [this message]
2021-04-02 15:43 ` [PR PATCH] [Updated] " ericonr
2021-04-02 19:00 ` [WIP] " ericonr
2021-04-02 19:03 ` ericonr
2021-04-02 19:05 ` ericonr
2021-04-09 1:06 ` sgn
2021-06-24 14:05 ` [PR PATCH] [Closed]: " ericonr
2021-06-24 14:05 ` ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29952@inbox.vuxu.org \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).