Patchwork [03/30] lsbsetup: use ${bindir} instead of /usr/bin for packaging

login
register
mail settings
Submitter Javier Martinez Canillas
Date Aug. 5, 2012, 3:53 p.m.
Message ID <1344182057-15981-4-git-send-email-javier@dowhile0.org>
Download mbox | patch
Permalink /patch/33845/
State New
Headers show

Comments

Javier Martinez Canillas - Aug. 5, 2012, 3:53 p.m.
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/lsbsetup_1.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Mark Hatle - Aug. 6, 2012, 5:25 p.m.
On 8/5/12 10:53 AM, Javier Martinez Canillas wrote:
> 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/lsbsetup_1.0.bb |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-extended/lsb/lsbsetup_1.0.bb b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
> index 9172ee3..bda4589 100644
> --- a/meta/recipes-extended/lsb/lsbsetup_1.0.bb
> +++ b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
> @@ -11,9 +11,9 @@ S = "${WORKDIR}"
>
>   do_install() {
>       # Only install file if it has a contents
> -    install -d ${D}/usr/bin
> +    install -d ${D}${bindir}

the LSB required /usr/bin, I think.  So this might be one of the few cases were 
specifying /usr/bin is acceptable.

(but I'm not against the change)

--Mark

>       install -d ${D}/${sysconfdir}
> -    install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin
> +    install -m 0755 ${S}/LSB_Setup.sh ${D}${bindir}
>       install -d  ${D}/${libdir}/lsb
>       ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
>       ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
>

Patch

diff --git a/meta/recipes-extended/lsb/lsbsetup_1.0.bb b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
index 9172ee3..bda4589 100644
--- a/meta/recipes-extended/lsb/lsbsetup_1.0.bb
+++ b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
@@ -11,9 +11,9 @@  S = "${WORKDIR}"
 
 do_install() {
     # Only install file if it has a contents
-    install -d ${D}/usr/bin
+    install -d ${D}${bindir}
     install -d ${D}/${sysconfdir}
-    install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin
+    install -m 0755 ${S}/LSB_Setup.sh ${D}${bindir}
     install -d  ${D}/${libdir}/lsb
     ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
     ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd