From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail1.windriver.com ([147.11.146.13]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1STtAE-0005YC-IL for openembedded-core@lists.openembedded.org; Mon, 14 May 2012 13:10:06 +0200 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca [147.11.189.40]) by mail1.windriver.com (8.14.3/8.14.3) with ESMTP id q4E9bohp000942 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Mon, 14 May 2012 02:37:51 -0700 (PDT) Received: from jesse-workmachine.corp.ad.wrs.com (128.224.162.230) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.1.255.0; Mon, 14 May 2012 02:37:50 -0700 From: Jesse Zhang To: Date: Mon, 14 May 2012 17:35:59 +0800 Message-ID: <1336988159-18432-1-git-send-email-sen.zhang@windriver.com> X-Mailer: git-send-email 1.7.7 MIME-Version: 1.0 Cc: Zhenfeng.Zhao@windriver.com Subject: [PATCH] wpa-supplicant: don't reset ${S} X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2012 11:10:06 -0000 Content-Type: text/plain 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 --- [Resending. The last copy didn't appear after two hours. Sorry for the inconvenience.] 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 -- 1.7.7.6