From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 2/2] bash: fix warning about bashbug reference /usr/bin when installed in /bin
Date: Thu, 26 Jul 2012 12:05:27 -0700 [thread overview]
Message-ID: <501194F7.7070003@linux.intel.com> (raw)
In-Reply-To: <1342804329-5791-2-git-send-email-otavio@ossystems.com.br>
On 07/20/2012 10:12 AM, Otavio Salvador wrote:
> Change the installation process so we have bashbug in ${bindir} and
> bash at ${base_bindir}.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> meta/recipes-extended/bash/bash.inc | 11 ++++++++---
> meta/recipes-extended/bash/bash_4.2.bb | 2 +-
> 2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
> index 6d7e930..a7f5f8f 100644
> --- a/meta/recipes-extended/bash/bash.inc
> +++ b/meta/recipes-extended/bash/bash.inc
> @@ -9,9 +9,6 @@ DEPENDS = "ncurses bison-native"
>
> inherit autotools gettext update-alternatives
>
> -bindir = "/bin"
> -sbindir = "/sbin"
> -
> EXTRA_OECONF = "--enable-job-control"
> export CC_FOR_BUILD = "${BUILD_CC}"
>
> @@ -28,6 +25,14 @@ do_configure_prepend () {
> fi
> }
>
> +do_install_append () {
> + # Move /usr/bin/bash to /bin/bash, if need
> + if [ "${base_bindir}" != "${bindir}" ]; then
> + mkdir -p ${D}${base_bindir}
> + mv ${D}${bindir}/bash ${D}${base_bindir}
> + fi
> +}
> +
> pkg_postinst_${PN} () {
> touch $D${sysconfdir}/shells
> grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
> diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
> index a28279e..50f2ff6 100644
> --- a/meta/recipes-extended/bash/bash_4.2.bb
> +++ b/meta/recipes-extended/bash/bash_4.2.bb
> @@ -1,6 +1,6 @@
> require bash.inc
>
> -PR = "r3"
> +PR = "r4"
>
> SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
> ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \
>
Took this patch into OE-Core, the parallel build is still failing.
Thanks
Sau!
next prev parent reply other threads:[~2012-07-26 19:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-20 17:12 [PATCH 1/2] bash: enable parallel build Otavio Salvador
2012-07-20 17:12 ` [PATCH 2/2] bash: fix warning about bashbug reference /usr/bin when installed in /bin Otavio Salvador
2012-07-26 19:05 ` Saul Wold [this message]
2012-07-25 8:51 ` [PATCH 1/2] bash: enable parallel build Richard Purdie
2012-07-25 12:11 ` Otavio Salvador
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=501194F7.7070003@linux.intel.com \
--to=sgw@linux.intel.com \
--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