From: Jesse Zhang <sen.zhang@windriver.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Cc: Zhenfeng.Zhao@windriver.com
Subject: Re: [PATCH] wpa-supplicant: don't reset ${S}
Date: Wed, 16 May 2012 14:56:41 +0800 [thread overview]
Message-ID: <4FB34FA9.7010009@windriver.com> (raw)
In-Reply-To: <1336980383-11201-1-git-send-email-sen.zhang@windriver.com>
Please ignore this one.
I found I could just use the "patchdir" parameter.
jesse
On 05/14/2012 03:26 PM, Jesse Zhang wrote:
> If ${S} is set to the subdir wpa_supplicant, patches with changes in
> other subdirs can't be applied. Fix ${S} so patches can be applied in
> the normal way.
>
> Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
> ---
>
> I was adding a patch to wpa-supplicant using bbappend in our layer, but it was
> impossible since ${S} was overridden and set to a subdir in the unpacked
> source.
>
> Jesse
>
> .../wpa-supplicant/wpa-supplicant-0.7.inc | 15 +++++++++------
> 1 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
> index aabb3df..1db4acf 100644
> --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
> @@ -3,9 +3,9 @@ HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
> BUGTRACKER = "http://hostap.epitest.fi/bugz/"
> SECTION = "network"
> LICENSE = "GPLv2 | BSD"
> -LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
> - file://../README;md5=54cfc88015d3ce83f7156e63c6bb1738 \
> - file://wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
> + file://README;md5=54cfc88015d3ce83f7156e63c6bb1738 \
> + file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=17;md5=acdc5a4b0d6345f21f136eace747260e"
> DEPENDS = "gnutls dbus libnl"
> RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
>
> @@ -16,7 +16,7 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
> file://wpa_supplicant.conf-sane \
> file://99_wpa_supplicant"
>
> -S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant"
> +S = "${WORKDIR}/wpa_supplicant-${PV}/"
>
> PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
> FILES_wpa-supplicant-passphrase = "${sbindir}/wpa_passphrase"
> @@ -24,16 +24,19 @@ FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
> FILES_${PN} += "${datadir}/dbus-1/system-services/*"
>
> do_configure () {
> + cd wpa_supplicant
> install -m 0755 ${WORKDIR}/defconfig-gnutls .config
> }
>
> export EXTRA_CFLAGS = "${CFLAGS}"
> do_compile () {
> + cd wpa_supplicant
> unset CFLAGS CPPFLAGS CXXFLAGS
> oe_runmake
> }
>
> do_install () {
> + cd wpa_supplicant
> install -d ${D}${sbindir}
> install -m 755 wpa_supplicant ${D}${sbindir}
> install -m 755 wpa_cli ${D}${sbindir}
> @@ -56,9 +59,9 @@ do_install () {
> ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
>
> install -d ${D}/${sysconfdir}/dbus-1/system.d
> - install -m 644 ${S}/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
> + install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
> install -d ${D}/${datadir}/dbus-1/system-services
> - install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services
> + install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
> sed -i -e s:${base_sbindir}:${sbindir}:g ${D}/${datadir}/dbus-1/system-services/*.service
>
> install -d ${D}/etc/default/volatiles
next prev parent reply other threads:[~2012-05-16 7:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-14 7:26 [PATCH] wpa-supplicant: don't reset ${S} Jesse Zhang
2012-05-16 6:56 ` Jesse Zhang [this message]
2012-05-14 9:35 Jesse Zhang
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=4FB34FA9.7010009@windriver.com \
--to=sen.zhang@windriver.com \
--cc=Zhenfeng.Zhao@windriver.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.