From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 07/11] classes/license: use "1" to set boolean variables
Date: Wed, 13 Nov 2013 14:32:44 +0000 [thread overview]
Message-ID: <77ca5bc6af846acebf8f0cf28af9724b39de99a5.1384353075.git.paul.eggleton@linux.intel.com> (raw)
In-Reply-To: <cover.1384353075.git.paul.eggleton@linux.intel.com>
In-Reply-To: <cover.1384353075.git.paul.eggleton@linux.intel.com>
The expected usage of COPY_LIC_MANIFEST and COPY_LIC_DIRS appears to be
to set them to "1" to enable; however the test here is just testing
whether they have a value at all, so setting them to "0" would also
enable them which is somewhat disingenuous. Actually check if they are
set to "1" instead in order to fix this.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/license.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 1c1b679..419105b 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -62,10 +62,10 @@ license_create_manifest() {
# - Just copy the manifest
# - Copy the manifest and the license directories
# With both options set we see a .5 M increase in core-image-minimal
- if [ -n "${COPY_LIC_MANIFEST}" ]; then
+ if [ "${COPY_LIC_MANIFEST}" = "1" ]; then
mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/
cp ${LICENSE_MANIFEST} ${IMAGE_ROOTFS}/usr/share/common-licenses/license.manifest
- if [ -n "${COPY_LIC_DIRS}" ]; then
+ if [ "${COPY_LIC_DIRS}" = "1" ]; then
for pkg in ${INSTALLED_PKGS}; do
mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}
for lic in `ls ${LICENSE_DIRECTORY}/${pkg}`; do
--
1.8.1.2
next prev parent reply other threads:[~2013-11-13 14:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-13 14:32 [PATCH 00/11] Misc cleanups / validation improvements Paul Eggleton
2013-11-13 14:32 ` [PATCH 01/11] scripts/create-recipe: fix handling of --help Paul Eggleton
2013-11-13 14:32 ` [PATCH 02/11] classes/insane: improve LIC_FILES_CHKSUM messages Paul Eggleton
2013-11-13 14:32 ` [PATCH 03/11] classes/sanity: validate SDKMACHINE value Paul Eggleton
2013-11-13 14:32 ` [PATCH 04/11] bitbake.conf: remove BOOTSTRAP_EXTRA_* variable defaults Paul Eggleton
2013-11-13 14:32 ` [PATCH 05/11] bitbake.conf: remove CPU_FEATURES defaults Paul Eggleton
2013-11-13 14:32 ` [PATCH 06/11] gtk-immodules-cache: fix error message to use correct names Paul Eggleton
2013-11-13 14:32 ` Paul Eggleton [this message]
2013-11-13 14:32 ` [PATCH 08/11] classes/license: fix comments Paul Eggleton
2013-11-13 14:32 ` [PATCH 09/11] systemd: " Paul Eggleton
2013-11-13 14:32 ` [PATCH 10/11] classes/pkg_distribute: remove Paul Eggleton
2013-11-13 14:32 ` [PATCH 11/11] classes/pkg_metainfo: remove Paul Eggleton
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=77ca5bc6af846acebf8f0cf28af9724b39de99a5.1384353075.git.paul.eggleton@linux.intel.com \
--to=paul.eggleton@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