From: Roman Khimov <roman@khimov.ru>
To: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 2/4] kernel: allow kernel module and firmware installation with ${base_libdir} != "/lib"
Date: Wed, 16 Dec 2015 22:48:25 +0300 [thread overview]
Message-ID: <2360766.U5DTSUWlGb@masala.hex> (raw)
In-Reply-To: <c69d29cd0ed3171613c5b30894a33e24ef29e20b.1450288828.git.mschiffer@universe-factory.net>
В письме от 16 декабря 2015 19:11:58 пользователь Matthias Schiffer написал:
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 4ce1611..8fc1d5d 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -242,6 +242,11 @@ kernel_do_install() {
> rm "${D}/lib/modules/${KERNEL_VERSION}/source"
> # If the kernel/ directory is empty remove it to prevent QA issues
> rmdir --ignore-fail-on-non-empty
> "${D}/lib/modules/${KERNEL_VERSION}/kernel" +
> + if [ "${base_libdir}" != "/lib" ]; then
> + install -d "${D}${base_libdir}"
> + mv "${D}/lib/modules" "${D}${base_libdir}"
> + fi
> else
> bbnote "no modules to install"
> fi
> @@ -258,6 +263,12 @@ kernel_do_install() {
> [ -e Module.symvers ] && install -m 0644 Module.symvers
> ${D}/boot/Module.symvers-${KERNEL_VERSION} install -d
> ${D}${sysconfdir}/modules-load.d
> install -d ${D}${sysconfdir}/modprobe.d
> +
> + if [ "${base_libdir}" != "/lib" ]; then
> + install -d "${D}${base_libdir}"
> + mv "${D}/lib/firmware" "${D}${base_libdir}"
> + rmdir --ignore-fail-on-non-empty "${D}/lib"
> + fi
> }
> do_install[prefuncs] += "package_get_auto_pr"
I think this hunks are not needed if you're to fix fs-perms.txt.
--
http://roman.khimov.ru
mailto: roman@khimov.ru
gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3
next prev parent reply other threads:[~2015-12-16 19:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-16 18:11 [PATCH 0/4] Implement merged /usr Matthias Schiffer
2015-12-16 18:11 ` [PATCH 1/4] busybox: generalize recipe to work with arbitrary install directories Matthias Schiffer
2015-12-16 18:11 ` [PATCH 2/4] kernel: allow kernel module and firmware installation with ${base_libdir} != "/lib" Matthias Schiffer
2015-12-16 19:48 ` Roman Khimov [this message]
2015-12-16 19:49 ` Roman Khimov
2015-12-16 18:11 ` [PATCH 3/4] base-files: create ${base_bindir} etc. instead of /bin, /sbin and /lib Matthias Schiffer
2015-12-22 17:31 ` Burton, Ross
2015-12-22 18:43 ` Matthias Schiffer
2015-12-22 21:11 ` Burton, Ross
2015-12-16 18:12 ` [PATCH 4/4] base-files: create typical merged /usr symlinks if the "merged-usr" distro feature is set Matthias Schiffer
2015-12-16 19:46 ` Roman Khimov
2015-12-17 9:47 ` Matthias Schiffer
2015-12-17 11:49 ` Roman Khimov
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=2360766.U5DTSUWlGb@masala.hex \
--to=roman@khimov.ru \
--cc=openembedded-core@lists.openembedded.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