From: Javier Martinez Canillas <javier@dowhile0.org>
To: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 11/28] lsb: use ${base_bindir} and ${sysconfdir} instead of /bin and /etc
Date: Sun, 5 Aug 2012 21:48:39 +0200 [thread overview]
Message-ID: <1344196136-7643-12-git-send-email-javier@dowhile0.org> (raw)
In-Reply-To: <1344196136-7643-1-git-send-email-javier@dowhile0.org>
It is considered good practice to use the build system provided
variables instead of directly specify hardcoded paths.
Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
---
meta/recipes-extended/lsb/lsb_1.4.bb | 62 +++++++++++++++++-----------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index 15dbeaa..513998c 100644
--- a/meta/recipes-extended/lsb/lsb_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb_1.4.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "LSB support for OpenEmbedded"
SECTION = "console/utils"
HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
LICENSE = "GPLv2+"
-PR = "r3"
+PR = "r4"
# lsb_release needs getopt
RDEPENDS_${PN} += "util-linux"
@@ -23,54 +23,54 @@ S = "${WORKDIR}/lsb-release-${PV}"
do_install(){
oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D}
- mkdir -p ${D}/bin
+ mkdir -p ${D}${base_bindir}
mkdir -p ${D}/${baselib}
- mkdir -p ${D}/etc/lsb-release.d
- echo -n "LSB_VERSION=\"core-4.1-noarch:" > ${D}/etc/lsb-release
+ mkdir -p ${D}${sysconfdir}/lsb-release.d
+ echo -n "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release
if [ "${TARGET_ARCH}" = "i586" ];then
- echo -n "core-4.1-ia32" >> ${D}/etc/lsb-release
+ echo -n "core-4.1-ia32" >> ${D}${sysconfdir}/lsb-release
else
- echo -n "core-4.1-${TARGET_ARCH}" >> ${D}/etc/lsb-release
+ echo -n "core-4.1-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release
fi
- echo "\"" >> ${D}/etc/lsb-release
- echo "DISTRIB_ID=${DISTRO}" >> ${D}/etc/lsb-release
- echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}/etc/lsb-release
- echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}/etc/lsb-release
+ echo "\"" >> ${D}${sysconfdir}/lsb-release
+ echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release
+ echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}${sysconfdir}/lsb-release
+ echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release
if [ "${TARGET_ARCH}" = "i586" ];then
- mkdir -p ${D}/etc/lsb-release.d
- touch ${D}/etc/lsb-release.d/graphics-4.1-noarch
- touch ${D}/etc/lsb-release.d/graphics-${PV}-noarch
- touch ${D}/etc/lsb-release.d/desktop-${PV}-noarch
- touch ${D}/etc/lsb-release.d/graphics-4.1-ia32
- touch ${D}/etc/lsb-release.d/graphics-${PV}-ia32
- touch ${D}/etc/lsb-release.d/desktop-${PV}-ia32
+ mkdir -p ${D}${sysconfdir}/lsb-release.d
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-noarch
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch
+ touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-noarch
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-ia32
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ia32
+ touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ia32
elif [ "${TARGET_ARCH}" = "x86_64" ];then
- touch ${D}/etc/lsb-release.d/graphics-4.1-noarch
- touch ${D}/etc/lsb-release.d/graphics-4.1-amd64
- touch ${D}/etc/lsb-release.d/graphics-${PV}-amd64
- touch ${D}/etc/lsb-release.d/desktop-${PV}-amd64
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-noarch
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-amd64
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-amd64
+ touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-amd64
fi
if [ "${TARGET_ARCH}" = "powerpc" ];then
- touch ${D}/etc/lsb-release.d/graphics-4.1-noarch
- touch ${D}/etc/lsb-release.d/graphics-4.1-ppc32
- touch ${D}/etc/lsb-release.d/graphics-${PV}-ppc32
- touch ${D}/etc/lsb-release.d/desktop-${PV}-ppc32
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-noarch
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-ppc32
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ppc32
+ touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc32
elif [ "${TARGET_ARCH}" = "powerpc64" ];then
- touch ${D}/etc/lsb-release.d/graphics-4.1-noarch
- touch ${D}/etc/lsb-release.d/graphics-4.1-ppc64
- touch ${D}/etc/lsb-release.d/graphics-${PV}-ppc64
- touch ${D}/etc/lsb-release.d/desktop-${PV}-ppc64
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-noarch
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-ppc64
+ touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ppc64
+ touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc64
fi
}
do_install_append(){
- install -d ${D}/etc/core-lsb
+ install -d ${D}${sysconfdir}/core-lsb
install -d ${D}/${baselib}/lsb
for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon
do
- install -m 0755 ${WORKDIR}/${i} ${D}/etc/core-lsb
+ install -m 0755 ${WORKDIR}/${i} ${D}${sysconfdir}/core-lsb
done
install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
if [ "${TARGET_ARCH}" = "x86_64" ];then
--
1.7.7.6
next prev parent reply other threads:[~2012-08-05 20:01 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-05 19:48 (No subject) Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 01/28] xinetd: use ${sbindir} and ${sysconfdir} instead of /usr/sbin and /etc Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 02/28] alsa-state: use ${sbindir} instead of /usr/sbin for packaging Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 03/28] lsbsetup: use ${bindir} instead of /usr/bin " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 04/28] sudo: use ${bindir} and ${sysconfdir} instead of /usr/bin and /etc Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 05/28] lsbtest: use ${bindir} instead of /usr/bin for packaging Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 06/28] cronie: use variables instead of hardcoded paths Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 07/28] useradd-example: use ${datadir} instead of /usr/share for packaging Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 08/28] ubootchart: use variables instead of hardcoded paths Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 09/28] xkeyboard-config: use ${datadir} instead of /usr/share for packaging Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 10/28] systemtap: " Javier Martinez Canillas
2012-08-05 19:48 ` Javier Martinez Canillas [this message]
2012-08-05 19:48 ` [PATCH v2 12/28] mingetty: use ${base_sbindir} instead of /sbin " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 13/28] external-sourcery: use ${prefix} and ${libdir} instead of /usr and /usr/lib Javier Martinez Canillas
2012-08-05 21:34 ` Chris Larson
2012-08-05 21:53 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 14/28] rpm: use ${localstatedir} and ${libdir} instead of /var " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 15/28] at: use ${base_sbindir} instead of /sbin for packaging Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 16/28] kernel.bbclass: use ${base_libdir} and ${sysconfdir} instead of /lib and /etc Javier Martinez Canillas
2012-08-06 16:14 ` Darren Hart
2012-08-06 17:26 ` Javier Martinez Canillas
2012-08-07 20:04 ` Khem Raj
2012-08-07 20:19 ` McClintock Matthew-B29882
2012-08-05 19:48 ` [PATCH v2 17/28] linux-firware: use ${base_libdir} instead of /lib for packaging Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 18/28] openssh: use ${localstatedir} instead of /var " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 19/28] libpam: use ${localstatedir} and ${sysconfdir} instead of /var and /etc Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 20/28] x11-common: use ${sysconfdir} instead of /etc for packaging Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 21/28] builder: " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 22/28] xserver-nodm-init: " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 23/28] lsbinitscripts: " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 24/28] usbinit: " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 25/28] qemu-config: " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 26/28] rsync: " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 27/28] chkconfig: " Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 28/28] man: " Javier Martinez Canillas
2012-08-06 14:59 ` (No subject) Richard Purdie
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=1344196136-7643-12-git-send-email-javier@dowhile0.org \
--to=javier@dowhile0.org \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.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