[PATCH 00/30] cleanup: use variables instead of hardcoded paths

[PATCH 00/30] cleanup: use variables instead of hardcoded paths

[Javier Martinez Canillas]

The OpenEmbedded User Manual list the variables that should be used to
control the directories into which files are installed.

It says that is a poor practice to specify hardcoded paths instead of
using these variables, yet there are many recipes that don't use it.

This is a big patch-set that does a cleanup and replace the hardcoded
paths used on these recipes with the build system installation variables.

I tried to be as careful as possible to do the proper replacement but
since I could introduce regressions I split the changes in 30 different
patches so it could be git bisectable in case of messing a recipe.

Also, I didn't increment the PR on the recipes since the modifications
don't introduce a semantic change on them.

The patch-set consist of the following patches:

[PATCH 01/30] xinetd: use ${sbindir} instead of /usr/sbin for
[PATCH 02/30] alsa-state: use ${sbindir} instead of /usr/sbin for
[PATCH 03/30] lsbsetup: use ${bindir} instead of /usr/bin for
[PATCH 04/30] sudo: use ${bindir} and ${sysconfdir} instead of
[PATCH 05/30] lsbtest: use ${bindir} instead of /usr/bin for
[PATCH 06/30] cronie: use variables instead of hardcoded paths
[PATCH 07/30] useradd-example: use ${datadir} instead of /usr/share
[PATCH 08/30] ubootchart: use variables instead of hardcoded paths
[PATCH 09/30] xkeyboard-config: use ${datadir} instead of /usr/share
[PATCH 10/30] systemtap: use ${datadir} instead of /usr/share for
[PATCH 11/30] lsb: use ${base_bindir} instead of /bin for packaging
[PATCH 12/30] mingetty: use ${base_sbindir} instead of /sbin for
[PATCH 13/30] external-sourcery: use ${prefix} and ${libdir} instead
[PATCH 14/30] rpm: use ${localstatedir} and ${libdir} instead of
[PATCH 15/30] at: use ${base_sbindir} instead of /sbin for packaging
[PATCH 16/30] kernel.bbclass: use ${base_libdir} and ${sysconfdir}
[PATCH 17/30] linux-firware: use ${base_libdir} instead of /lib for
[PATCH 18/30] openssh: use ${localstatedir} instead of /var for
[PATCH 19/30] libpam: use ${localstatedir} and ${sysconfdir} instead
[PATCH 20/30] x11-common: use ${sysconfdir} instead of /etc for
[PATCH 21/30] lsb: use ${sysconfdir} instead of /etc for packaging
[PATCH 22/30] builder: use ${sysconfdir} instead of /etc for
[PATCH 23/30] xserver-nodm-init: use ${sysconfdir} instead of /etc
[PATCH 24/30] lsbinitscripts: use ${sysconfdir} instead of /etc for
[PATCH 25/30] xinetd: use ${sysconfdir} instead of /etc for
[PATCH 26/30] usbinit: use ${sysconfdir} instead of /etc for
[PATCH 27/30] qemu-config: use ${sysconfdir} instead of /etc for
[PATCH 28/30] rsync: use ${sysconfdir} instead of /etc for packaging
[PATCH 29/30] chkconfig: use ${sysconfdir} instead of /etc for
[PATCH 30/30] man: use ${sysconfdir} instead of /etc for packaging

Best regards,
Javier

[PATCH 01/30] xinetd: use ${sbindir} instead of /usr/sbin for packaging

[Javier Martinez Canillas]

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/xinetd/xinetd_2.3.15.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index a142143..579c28b 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -38,15 +38,15 @@ do_install() {
 	# Same here, the Makefile does some really stupid things,
 	# but since we only want two files why not override
 	# do_install from autotools and doing it ourselfs?
-	install -d "${D}/usr/sbin"
+	install -d "${D}${sbindir}"
 	install -d "${D}/etc/init.d"
 	install -d "${D}/etc/xinetd.d"
 	install -d "${D}/etc/default"
 	install -m 644 "${WORKDIR}/xinetd.conf" "${D}/etc"
 	install -m 755 "${WORKDIR}/xinetd.init" "${D}/etc/init.d/xinetd"
 	install -m 644 "${WORKDIR}/xinetd.default" "${D}/etc/default/xinetd"
-	install -m 755 "${S}/xinetd/xinetd" "${D}/usr/sbin"
-	install -m 755 "${S}/xinetd/itox" "${D}/usr/sbin"
+	install -m 755 "${S}/xinetd/xinetd" "${D}${sbindir}"
+	install -m 755 "${S}/xinetd/itox" "${D}${sbindir}"
 }
 
 CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"
-- 
1.7.7.6

[PATCH 02/30] alsa-state: use ${sbindir} instead of /usr/sbin for packaging

[Javier Martinez Canillas]

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-bsp/alsa-state/alsa-state.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb
index 83c9faa..e2eb4fe 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/meta/recipes-bsp/alsa-state/alsa-state.bb
@@ -46,9 +46,9 @@ FILES_alsa-states = "${localstatedir}/lib/alsa/*.state"
 pkg_postinst_${PN}() {
 	if test -z "$D"
 	then
-		if test -x /usr/sbin/alsactl
+		if test -x ${sbindir}/alsactl
 		then
-			/usr/sbin/alsactl -f ${localstatedir}/lib/alsa/asound.state restore
+			${sbindir}/alsactl -f ${localstatedir}/lib/alsa/asound.state restore
 		fi
 		# INITSCRIPT_PARAMS changed, so remove the old and
 		# install the new setting.
-- 
1.7.7.6

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

[Javier Martinez Canillas]

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}
     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
-- 
1.7.7.6

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

[Mark Hatle]

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 04/30] sudo: use ${bindir} and ${sysconfdir} instead of /usr/bin and /etc

[Javier Martinez Canillas]

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/sudo/sudo_1.8.5p2.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/sudo/sudo_1.8.5p2.bb b/meta/recipes-extended/sudo/sudo_1.8.5p2.bb
index dfba7e0..0b940d2 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.5p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.5p2.bb
@@ -24,6 +24,6 @@ do_install_append () {
 		fi
 	done
 
-	chmod 4111 ${D}/usr/bin/sudo
-	chmod 0440 ${D}/etc/sudoers
+	chmod 4111 ${D}${bindir}/sudo
+	chmod 0440 ${D}${sysconfdir}/sudoers
 }
-- 
1.7.7.6

[PATCH 05/30] lsbtest: use ${bindir} instead of /usr/bin for packaging

[Javier Martinez Canillas]

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/lsbtest_1.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsbtest_1.0.bb b/meta/recipes-extended/lsb/lsbtest_1.0.bb
index 1191164..a563678 100644
--- a/meta/recipes-extended/lsb/lsbtest_1.0.bb
+++ b/meta/recipes-extended/lsb/lsbtest_1.0.bb
@@ -14,8 +14,8 @@ RDEPENDS_${PN} = "rpm"
 S = "${WORKDIR}"
 
 do_install() {
-	install -d ${D}/usr/bin
-	install -m 0755 ${S}/LSB_Test.sh ${D}/usr/bin
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/LSB_Test.sh ${D}${bindir}
 	install -d  ${D}/opt/lsb-test
 	install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list
 	install -m 0644 ${S}/session ${D}/opt/lsb-test/session
-- 
1.7.7.6

[PATCH 06/30] cronie: use variables instead of hardcoded paths

[Javier Martinez Canillas]

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/cronie/cronie_1.4.8.bb |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-extended/cronie/cronie_1.4.8.bb b/meta/recipes-extended/cronie/cronie_1.4.8.bb
index 2d25627..74203ed 100644
--- a/meta/recipes-extended/cronie/cronie_1.4.8.bb
+++ b/meta/recipes-extended/cronie/cronie_1.4.8.bb
@@ -61,14 +61,14 @@ do_install_append () {
 	# below setting is necessary to allow normal user using crontab
 
 	# setgid for crontab binary
-	chown root:crontab ${D}/usr/bin/crontab
-	chmod 2755 ${D}/usr/bin/crontab
+	chown root:crontab ${D}${bindir}/crontab
+	chmod 2755 ${D}${bindir}/crontab
 
 	# allow 'crontab' group write to /var/spool/cron
-	chown root:crontab ${D}/var/spool/cron
-	chmod 770 ${D}/var/spool/cron
+	chown root:crontab ${D}${localstatedir}/spool/cron
+	chmod 770 ${D}${localstatedir}/spool/cron
 
-	chmod 600 ${D}/etc/crontab
+	chmod 600 ${D}${sysconfdir}/crontab
 }
 
 FILES_${PN} += "${sysconfdir}/cron*"
-- 
1.7.7.6

[PATCH 07/30] useradd-example: use ${datadir} instead of /usr/share for packaging

[Javier Martinez Canillas]

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>
---
 .../recipes-skeleton/useradd/useradd-example.bb    |   34 ++++++++++----------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
index b10c1d0..8315dc0 100644
--- a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
+++ b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
@@ -43,32 +43,32 @@ GROUPADD_PARAM_${PN} = "-g 880 group1; -g 890 group2"
 GROUPADD_PARAM_${PN}-user3 = "-g 900 group3"
 
 do_install () {
-	install -d -m 755 ${D}/usr/share/user1
-	install -d -m 755 ${D}/usr/share/user2
-	install -d -m 755 ${D}/usr/share/user3
+	install -d -m 755 ${D}${datadir}/user1
+	install -d -m 755 ${D}${datadir}/user2
+	install -d -m 755 ${D}${datadir}/user3
 
-	install -p -m 644 file1 ${D}/usr/share/user1/
-	install -p -m 644 file2 ${D}/usr/share/user1/
+	install -p -m 644 file1 ${D}${datadir}/user1/
+	install -p -m 644 file2 ${D}${datadir}/user1/
 
-	install -p -m 644 file2 ${D}/usr/share/user2/
-	install -p -m 644 file3 ${D}/usr/share/user2/
+	install -p -m 644 file2 ${D}${datadir}/user2/
+	install -p -m 644 file3 ${D}${datadir}/user2/
 
-	install -p -m 644 file3 ${D}/usr/share/user3/
-	install -p -m 644 file4 ${D}/usr/share/user3/
+	install -p -m 644 file3 ${D}${datadir}/user3/
+	install -p -m 644 file4 ${D}${datadir}/user3/
 
 	# The new users and groups are created before the do_install
 	# step, so you are now free to make use of them:
-	chown -R user1 ${D}/usr/share/user1
-	chown -R user2 ${D}/usr/share/user2
-	chown -R user3 ${D}/usr/share/user3
+	chown -R user1 ${D}${datadir}/user1
+	chown -R user2 ${D}${datadir}/user2
+	chown -R user3 ${D}${datadir}/user3
 
-	chgrp -R group1 ${D}/usr/share/user1
-	chgrp -R group2 ${D}/usr/share/user2
-	chgrp -R group3 ${D}/usr/share/user3
+	chgrp -R group1 ${D}${datadir}/user1
+	chgrp -R group2 ${D}${datadir}/user2
+	chgrp -R group3 ${D}${datadir}/user3
 }
 
-FILES_${PN} = "/usr/share/user1/* /usr/share/user2/*"
-FILES_${PN}-user3 = "/usr/share/user3/*"
+FILES_${PN} = "${datadir}/user1/* ${datadir}/user2/*"
+FILES_${PN}-user3 = "${datadir}/user3/*"
 
 # Prevents do_package failures with:
 # debugsources.list: No such file or directory:
-- 
1.7.7.6

[PATCH 08/30] ubootchart: use variables instead of hardcoded paths

[Javier Martinez Canillas]

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-devtools/ubootchart/ubootchart_svn.bb |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
index b49e94a..4787857 100644
--- a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
+++ b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
@@ -27,13 +27,13 @@ do_compile() {
 }
 
 do_install() {
-        install -m 0755 -d ${D}/sbin ${D}/etc/ubootchart ${D}/usr/share/applications
-        install -m 0755 ${S}/ubootchartd_bin ${D}/sbin
-        install -m 0755 ${S}/ubootchartd ${D}/sbin
-        install -m 0644 ${S}/ubootchart.conf ${D}/etc/ubootchart
-        install -m 0755 ${S}/start.sh ${D}/etc/ubootchart
-        install -m 0755 ${S}/finish.sh ${D}/etc/ubootchart
+        install -m 0755 -d ${D}${base_sbindir} ${D}${sysconfdir}/ubootchart ${D}${datadir}/applications
+        install -m 0755 ${S}/ubootchartd_bin ${D}${base_sbindir}
+        install -m 0755 ${S}/ubootchartd ${D}${base_sbindir}
+        install -m 0644 ${S}/ubootchart.conf ${D}${sysconfdir}/ubootchart
+        install -m 0755 ${S}/start.sh ${D}${sysconfdir}/ubootchart
+        install -m 0755 ${S}/finish.sh ${D}${sysconfdir}/ubootchart
         
-        install -m 0755 ${WORKDIR}/ubootchart-stop ${D}/sbin
-        install -m 0644 ${WORKDIR}/ubootchart.desktop ${D}/usr/share/applications
+        install -m 0755 ${WORKDIR}/ubootchart-stop ${D}${base_sbindir}
+        install -m 0644 ${WORKDIR}/ubootchart.desktop ${D}${datadir}/applications
 }
-- 
1.7.7.6

[PATCH 09/30] xkeyboard-config: use ${datadir} instead of /usr/share for packaging

[Javier Martinez Canillas]

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>
---
 .../xorg-lib/xkeyboard-config_2.1.bb               |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
index b077fa3..1fc94d8 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
@@ -29,6 +29,6 @@ FILES_${PN} += "${datadir}/X11/xkb"
 inherit autotools pkgconfig
 
 do_install_append () {
-    install -d ${D}/usr/share/X11/xkb/compiled
+    install -d ${D}${datadir}/X11/xkb/compiled
     cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
 }
-- 
1.7.7.6

[PATCH 10/30] systemtap: use ${datadir} instead of /usr/share for packaging

[Javier Martinez Canillas]

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>
---
 .../systemtap/systemtap-uprobes_git.bb             |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
index b328e6b..8544841 100644
--- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
@@ -36,7 +36,7 @@ do_compile() {
 do_install() {
 	if [ -e "${S}/runtime/uprobes/uprobes.ko" ]
 	then
-		install -d ${D}/usr/share/systemtap/runtime/uprobes/
-		install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}/usr/share/systemtap/runtime/uprobes/
+		install -d ${D}${datadir}/systemtap/runtime/uprobes/
+		install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}${datadir}/systemtap/runtime/uprobes/
 	fi
 }
-- 
1.7.7.6

[PATCH 11/30] lsb: use ${base_bindir} instead of /bin for packaging

[Javier Martinez Canillas]

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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index 15dbeaa..5734c5c 100644
--- a/meta/recipes-extended/lsb/lsb_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb_1.4.bb
@@ -23,7 +23,7 @@ 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
-- 
1.7.7.6

Re: [PATCH 11/30] lsb: use ${base_bindir} instead of /bin for packaging

[Mark Hatle]

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/lsb_1.4.bb |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
> index 15dbeaa..5734c5c 100644
> --- a/meta/recipes-extended/lsb/lsb_1.4.bb
> +++ b/meta/recipes-extended/lsb/lsb_1.4.bb
> @@ -23,7 +23,7 @@ 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
>

This is another case with the lsb, that lsb-release (and a few other things) are 
documented to me installed into /bin.

Not objecting to the change, just explaining why it was implemented this way.

--Mark

[PATCH 12/30] mingetty: use ${base_sbindir} instead of /sbin for packaging

[Javier Martinez Canillas]

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/mingetty/mingetty_1.08.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/mingetty/mingetty_1.08.bb b/meta/recipes-extended/mingetty/mingetty_1.08.bb
index fed5dfd..cbc13c9 100644
--- a/meta/recipes-extended/mingetty/mingetty_1.08.bb
+++ b/meta/recipes-extended/mingetty/mingetty_1.08.bb
@@ -14,7 +14,7 @@ EXTRA_OEMAKE = "CC='${CC}'"
 
 do_install(){
     mkdir -p ${D}${mandir}/man8
-    mkdir -p ${D}/sbin
+    mkdir -p ${D}${base_sbindir}
     oe_runmake install DESTDIR=${D}
 }
 
-- 
1.7.7.6

[PATCH 13/30] external-sourcery: use ${prefix} and ${libdir} instead of /usr and /usr/lib

[Javier Martinez Canillas]

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/external-sourcery-toolchain.bb            |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
index 74c82ec..18c3105 100644
--- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
+++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
@@ -38,10 +38,10 @@ do_install() {
 	cp -a $sysroot/etc/. ${D}${sysconfdir}
 	cp -a $sysroot/sbin/. ${D}${base_sbindir}
 
-	install -d ${D}/usr
+	install -d ${D}${prefix}
 	for usr_element in bin libexec sbin share ${base_libdir}; do
 		usr_path=$sysroot/usr/$usr_element
-		cp -a $usr_path ${D}/usr/
+		cp -a $usr_path ${D}${prefix}/
 	done
 	for datadir_element in man info; do
 		datadir_path=$sysroot/usr/$datadir_element
@@ -81,7 +81,7 @@ external_toolchain_sysroot_adjust() {
 
 	# If the usr/lib directory doesn't exist, the toolchain fails to even
 	# try to find crti.o in a completely different directory (usr/lib64)
-	install -d ${SYSROOT_DESTDIR}/usr/lib
+	install -d ${SYSROOT_DESTDIR}${libdir}
 }
 
 PACKAGES =+ "libgcc libgcc-dev libstdc++ libstdc++-dev libstdc++-staticdev linux-libc-headers linux-libc-headers-dev gdbserver gdbserver-dbg"
-- 
1.7.7.6

[PATCH 14/30] rpm: use ${localstatedir} and ${libdir} instead of /var and /usr/lib

[Javier Martinez Canillas]

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-devtools/rpm/rpm_5.4.9.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index e276cc3..d93bd4d 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -421,8 +421,8 @@ do_install_append() {
 	rm -f ${D}/${libdir}/rpm/bin/dbconvert
 	rm -f ${D}/${libdir}/rpm/bin/pom2spec
 
-	rm -rf ${D}/var/lib/wdj ${D}/var/cache/wdj
-	rm -f ${D}/usr/lib/rpm/bin/api-sanity-checker.pl
+	rm -rf ${D}${localstatedir}/lib/wdj ${D}${localstatedir}/cache/wdj
+	rm -f ${D}${libdir}/rpm/bin/api-sanity-checker.pl
 }
 
 do_install_append_virtclass-native() {
-- 
1.7.7.6

[PATCH 15/30] at: use ${base_sbindir} instead of /sbin for packaging

[Javier Martinez Canillas]

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/at/at_3.1.13.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/at/at_3.1.13.bb b/meta/recipes-extended/at/at_3.1.13.bb
index 9af3569..1afcda2 100644
--- a/meta/recipes-extended/at/at_3.1.13.bb
+++ b/meta/recipes-extended/at/at_3.1.13.bb
@@ -51,8 +51,8 @@ do_install () {
 	install -d ${D}${sysconfdir}/rcS.d
 	install -m 0755    ${WORKDIR}/S99at		${D}${sysconfdir}/init.d/atd
 	ln -sf ../init.d/atd ${D}${sysconfdir}/rcS.d/S99at
-	cp -r ${D}/usr/doc/at ${D}${docdir}/
-	rm -rf ${D}/usr/doc
+	cp -r ${D}${prefix}/doc/at ${D}${docdir}/
+	rm -rf ${D}${prefix}/doc
 
 	for feature in ${DISTRO_FEATURES}; do
 		if [ "$feature" = "pam" ]; then
-- 
1.7.7.6

[PATCH 16/30] kernel.bbclass: use ${base_libdir} and ${sysconfdir} instead of /lib and /etc

[Javier Martinez Canillas]

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/classes/kernel.bbclass |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 1d8dff9..b434093 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -109,10 +109,10 @@ kernel_do_install() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
 		oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-		rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.order"
-		rm -f "${D}/lib/modules/${KERNEL_VERSION}/modules.builtin"
-		rm "${D}/lib/modules/${KERNEL_VERSION}/build"
-		rm "${D}/lib/modules/${KERNEL_VERSION}/source"
+		rm -f "${D}${base_libdir}/modules/${KERNEL_VERSION}/modules.order"
+		rm -f "${D}${base_libdir}/modules/${KERNEL_VERSION}/modules.builtin"
+		rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/build"
+		rm "${D}${base_libdir}/modules/${KERNEL_VERSION}/source"
 	else
 		bbnote "no modules to install"
 	fi
@@ -127,8 +127,8 @@ kernel_do_install() {
 	install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION}
 	install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
 	[ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
-	install -d ${D}/etc/modules-load.d
-	install -d ${D}/etc/modprobe.d
+	install -d ${D}${sysconfdir}/modules-load.d
+	install -d ${D}${sysconfdir}/modprobe.d
 
 	#
 	# Support for external module building - create a minimal copy of the
-- 
1.7.7.6

[PATCH 17/30] linux-firware: use ${base_libdir} instead of /lib for packaging

[Javier Martinez Canillas]

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>
---
 .../linux-firmware/linux-firmware_git.bb           |   34 ++++++++++----------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index a7e4ed6..c5ab173 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -35,50 +35,50 @@ do_compile() {
 }
 
 do_install() {
-	install -d  ${D}/lib/firmware/
-	cp -r * ${D}/lib/firmware/
+	install -d  ${D}${base_libdir}/firmware/
+	cp -r * ${D}${base_libdir}/firmware/
 
 	# Libertas sd8686
-	ln -sf libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
-	ln -sf libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
+	ln -sf libertas/sd8686_v9.bin ${D}${base_libdir}/firmware/sd8686.bin
+	ln -sf libertas/sd8686_v9_helper.bin ${D}${base_libdir}/firmware/sd8686_helper.bin
 
 	# Realtek rtl8192* 
-	install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}/lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt
+	install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}${base_libdir}/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt
 
 	# fixup wl12xx location, after 2.6.37 the kernel searches a different location for it
-	( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . )
+	( cd ${D}${base_libdir}/firmware ; ln -sf ti-connectivity/* . )
 }
 
 PACKAGES =+ "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su ${PN}-wl12xx"
 
 LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas"
 FILES_${PN}-sd8686 = " \
-  /lib/firmware/libertas/sd8686_v9* \
-  /lib/firmware/sd8686* \
-  /lib/firmware/LICENCE.libertas \
+  ${base_libdir}/firmware/libertas/sd8686_v9* \
+  ${base_libdir}/firmware/sd8686* \
+  ${base_libdir}/firmware/LICENCE.libertas \
 "
 
 LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware"
 FILES_${PN}-rtl8192cu = " \
-  /lib/firmware/rtlwifi/rtl8192cufw.bin \
-  /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
+  ${base_libdir}/firmware/rtlwifi/rtl8192cufw.bin \
+  ${base_libdir}/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
 "
 
 LICENSE_${PN}-rtl8192ce = "Firmware:LICENCE.rtlwifi_firmware"
 FILES_${PN}-rtl8192ce = " \
-  /lib/firmware/rtlwifi/rtl8192cfw.bin \
+  ${base_libdir}/firmware/rtlwifi/rtl8192cfw.bin \
 "
 
 LICENSE_${PN}-rtl8192su = "Firmware:LICENCE.rtlwifi_firmware"
 FILES_${PN}-rtl8192su = " \
-  /lib/firmware/rtlwifi/rtl8712u.bin \
+  ${base_libdir}/firmware/rtlwifi/rtl8712u.bin \
 "
 
 FILES_${PN}-wl12xx = " \
-  /lib/firmware/wl12* \
-  /lib/firmware/TI* \
-  /lib/firmware/ti-connectivity \
+  ${base_libdir}/firmware/wl12* \
+  ${base_libdir}/firmware/TI* \
+  ${base_libdir}/firmware/ti-connectivity \
 "
 
-FILES_${PN} += "/lib/firmware/*"
+FILES_${PN} += "${base_libdir}/firmware/*"
 
-- 
1.7.7.6

Re: [PATCH 17/30] linux-firware: use ${base_libdir} instead of /lib for packaging

[Darren Hart]

On 08/05/2012 08:54 AM, Javier Martinez Canillas wrote:
> It is considered good practice to use the build system provided
> variables instead of directly specify hardcoded paths.

The firmware location is explicitly set because this is where the Linux
kernel requires it to be. This patch will break firmware loading.

--
Darren

> Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
> ---
>  .../linux-firmware/linux-firmware_git.bb           |   34 ++++++++++----------
>  1 files changed, 17 insertions(+), 17 deletions(-)
> 
> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> index a7e4ed6..c5ab173 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
> @@ -35,50 +35,50 @@ do_compile() {
>  }
>  
>  do_install() {
> -	install -d  ${D}/lib/firmware/
> -	cp -r * ${D}/lib/firmware/
> +	install -d  ${D}${base_libdir}/firmware/
> +	cp -r * ${D}${base_libdir}/firmware/
>  
>  	# Libertas sd8686
> -	ln -sf libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
> -	ln -sf libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
> +	ln -sf libertas/sd8686_v9.bin ${D}${base_libdir}/firmware/sd8686.bin
> +	ln -sf libertas/sd8686_v9_helper.bin ${D}${base_libdir}/firmware/sd8686_helper.bin
>  
>  	# Realtek rtl8192* 
> -	install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}/lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt
> +	install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}${base_libdir}/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt
>  
>  	# fixup wl12xx location, after 2.6.37 the kernel searches a different location for it
> -	( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . )
> +	( cd ${D}${base_libdir}/firmware ; ln -sf ti-connectivity/* . )
>  }
>  
>  PACKAGES =+ "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su ${PN}-wl12xx"
>  
>  LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas"
>  FILES_${PN}-sd8686 = " \
> -  /lib/firmware/libertas/sd8686_v9* \
> -  /lib/firmware/sd8686* \
> -  /lib/firmware/LICENCE.libertas \
> +  ${base_libdir}/firmware/libertas/sd8686_v9* \
> +  ${base_libdir}/firmware/sd8686* \
> +  ${base_libdir}/firmware/LICENCE.libertas \
>  "
>  
>  LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware"
>  FILES_${PN}-rtl8192cu = " \
> -  /lib/firmware/rtlwifi/rtl8192cufw.bin \
> -  /lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
> +  ${base_libdir}/firmware/rtlwifi/rtl8192cufw.bin \
> +  ${base_libdir}/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt \
>  "
>  
>  LICENSE_${PN}-rtl8192ce = "Firmware:LICENCE.rtlwifi_firmware"
>  FILES_${PN}-rtl8192ce = " \
> -  /lib/firmware/rtlwifi/rtl8192cfw.bin \
> +  ${base_libdir}/firmware/rtlwifi/rtl8192cfw.bin \
>  "
>  
>  LICENSE_${PN}-rtl8192su = "Firmware:LICENCE.rtlwifi_firmware"
>  FILES_${PN}-rtl8192su = " \
> -  /lib/firmware/rtlwifi/rtl8712u.bin \
> +  ${base_libdir}/firmware/rtlwifi/rtl8712u.bin \
>  "
>  
>  FILES_${PN}-wl12xx = " \
> -  /lib/firmware/wl12* \
> -  /lib/firmware/TI* \
> -  /lib/firmware/ti-connectivity \
> +  ${base_libdir}/firmware/wl12* \
> +  ${base_libdir}/firmware/TI* \
> +  ${base_libdir}/firmware/ti-connectivity \
>  "
>  
> -FILES_${PN} += "/lib/firmware/*"
> +FILES_${PN} += "${base_libdir}/firmware/*"
>  
> 

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel

Re: [PATCH 17/30] linux-firware: use ${base_libdir} instead of /lib for packaging

[Phil Blundell]

On Mon, 2012-08-06 at 11:10 -0700, Darren Hart wrote:
> On 08/05/2012 08:54 AM, Javier Martinez Canillas wrote:
> > It is considered good practice to use the build system provided
> > variables instead of directly specify hardcoded paths.
> 
> The firmware location is explicitly set because this is where the Linux
> kernel requires it to be. 

Is that actually true?  I thought the kernel just supplied the leafname
that it wanted and the knowledge about what directory to search was
encoded in the hotplug helper scripts.

> This patch will break firmware loading.

That might well be the case, though, unless the scripts have also been
patched to respect ${base_libdir}.  

And, notwithstanding all the above, it's not entirely obvious that
${base_libdir} is semantically the right variable for things that aren't
libraries.  How does the udev recipe represent the patch to /lib/udev?

p.

Re: [PATCH 17/30] linux-firware: use ${base_libdir} instead of /lib for packaging

[Darren Hart]

On 08/06/2012 11:21 AM, Phil Blundell wrote:
> On Mon, 2012-08-06 at 11:10 -0700, Darren Hart wrote:
>> On 08/05/2012 08:54 AM, Javier Martinez Canillas wrote:
>>> It is considered good practice to use the build system provided
>>> variables instead of directly specify hardcoded paths.
>>
>> The firmware location is explicitly set because this is where the Linux
>> kernel requires it to be. 
> 
> Is that actually true?  I thought the kernel just supplied the leafname
> that it wanted and the knowledge about what directory to search was
> encoded in the hotplug helper scripts.

I was sure it was true at the time, but trying to get a reference from
the source suggests I was mistaken. According to
Documentation/firmware_class/README, the hotplug script is responsible
for locating the firmware by basename and catting it to a sysfs file for
the kernel to then read.

While there are several hardcoded references to "/lib/firmware"
(comments, installation of in-kernel firmware, etc.), none of these seem
to be related to loading firmware installed via linux-firmware.

So... the question I guess is: does hotplug know to look in
${base_libdir}/firmware.

But the larger concern, is that all these changes appear to have been
done via search/replace without any functional testing of the result.

--
Darren

> 
>> This patch will break firmware loading.
> 
> That might well be the case, though, unless the scripts have also been
> patched to respect ${base_libdir}.  
> 
> And, notwithstanding all the above, it's not entirely obvious that
> ${base_libdir} is semantically the right variable for things that aren't
> libraries.  How does the udev recipe represent the patch to /lib/udev?
> 
> p.
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel

Re: [PATCH 17/30] linux-firware: use ${base_libdir} instead of /lib for packaging

[Koen Kooi]

Op 7 aug. 2012, om 18:14 heeft Darren Hart <dvhart@linux.intel.com> het volgende geschreven:

> 
> 
> On 08/06/2012 11:21 AM, Phil Blundell wrote:
>> On Mon, 2012-08-06 at 11:10 -0700, Darren Hart wrote:
>>> On 08/05/2012 08:54 AM, Javier Martinez Canillas wrote:
>>>> It is considered good practice to use the build system provided
>>>> variables instead of directly specify hardcoded paths.
>>> 
>>> The firmware location is explicitly set because this is where the Linux
>>> kernel requires it to be. 
>> 
>> Is that actually true?  I thought the kernel just supplied the leafname
>> that it wanted and the knowledge about what directory to search was
>> encoded in the hotplug helper scripts.
> 
> I was sure it was true at the time, but trying to get a reference from
> the source suggests I was mistaken. According to
> Documentation/firmware_class/README, the hotplug script is responsible
> for locating the firmware by basename and catting it to a sysfs file for
> the kernel to then read.

That hasn't been the case for a long, long time. CONFIG_HOTPLUG should be "", the kernel can load it on its own now. Any reference to 'hotplug' as something executable is very outdated.

regards,

Koen

[PATCH 18/30] openssh: use ${localstatedir} instead of /var for packaging

[Javier Martinez Canillas]

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-connectivity/openssh/openssh_6.0p1.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
index 376023c..f0e87be 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
@@ -78,7 +78,7 @@ do_install_append () {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
 	rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
-	rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
+	rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir}
 }
 
 ALLOW_EMPTY_${PN} = "1"
-- 
1.7.7.6

[PATCH 19/30] libpam: use ${localstatedir} and ${sysconfdir} instead of /var and /etc

[Javier Martinez Canillas]

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/pam/libpam_1.1.5.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/pam/libpam_1.1.5.bb b/meta/recipes-extended/pam/libpam_1.1.5.bb
index dd75d42..241519f 100644
--- a/meta/recipes-extended/pam/libpam_1.1.5.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.5.bb
@@ -79,9 +79,9 @@ do_install() {
 	autotools_do_install
 
 	# don't install /var/run when populating rootfs. Do it through volatile
-	rm -rf ${D}/var
+	rm -rf ${D}${localstatedir}
 	install -d ${D}${sysconfdir}/default/volatiles
-	install -m 0644 ${WORKDIR}/99_pam ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_pam ${D}${sysconfdir}/default/volatiles
 
 	install -d ${D}${sysconfdir}/pam.d/     
 	install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
-- 
1.7.7.6

[PATCH 20/30] x11-common: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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-graphics/x11-common/x11-common_0.1.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index ddb3a1d..9567668 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -12,10 +12,10 @@ S = "${WORKDIR}"
 inherit allarch
 
 do_install() {
-	cp -R ${S}/etc ${D}/etc
-	chmod -R 755 ${D}/etc
-	find ${D}/etc -type d -name .svn -prune -exec rm -rf {} \;
-	find ${D}/etc -type f -name \*~ -exec rm -rf {} \;
+	cp -R ${S}/etc ${D}${sysconfdir}
+	chmod -R 755 ${D}${sysconfdir}
+	find ${D}${sysconfdir} -type d -name .svn -prune -exec rm -rf {} \;
+	find ${D}${sysconfdir} -type f -name \*~ -exec rm -rf {} \;
 }
 
 RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor"
-- 
1.7.7.6

[PATCH 21/30] lsb: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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 |   58 +++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index 5734c5c..7243151 100644
--- a/meta/recipes-extended/lsb/lsb_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb_1.4.bb
@@ -25,52 +25,52 @@ do_install(){
 	oe_runmake install prefix=${D}  mandir=${D}/${datadir}/man/ DESTDIR=${D} 
 	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

[PATCH 22/30] builder: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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-graphics/builder/builder_0.1.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/builder/builder_0.1.bb b/meta/recipes-graphics/builder/builder_0.1.bb
index cb5f440..88c8287 100644
--- a/meta/recipes-graphics/builder/builder_0.1.bb
+++ b/meta/recipes-graphics/builder/builder_0.1.bb
@@ -21,10 +21,10 @@ USERADD_PARAM_${PN} = "--system --create-home \
                        --user-group ${PN}"
 
 do_install () {
-	install -d -m 755 ${D}/etc/mini_x/session.d
-	install -p -m 755 builder_hob_start.sh ${D}/etc/mini_x/session.d/
+	install -d -m 755 ${D}${sysconfdir}/mini_x/session.d
+	install -p -m 755 builder_hob_start.sh ${D}${sysconfdir}/mini_x/session.d/
 
-	chown  ${PN}.${PN} ${D}/etc/mini_x/session.d/builder_hob_start.sh
-        install -p -m 755 please_wait_dialog.py ${D}/etc/mini_x
+	chown  ${PN}.${PN} ${D}${sysconfdir}/mini_x/session.d/builder_hob_start.sh
+        install -p -m 755 please_wait_dialog.py ${D}${sysconfdir}/mini_x
 }
 
-- 
1.7.7.6

[PATCH 23/30] xserver-nodm-init: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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>
---
 .../x11-common/xserver-nodm-init.bb                |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index 8fca056..0f7f46e 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -14,12 +14,12 @@ S = "${WORKDIR}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 do_install() {
-    install -d ${D}/etc
-    install -d ${D}/etc/init.d
-    install xserver-nodm ${D}/etc/init.d
+    install -d ${D}${sysconfdir}
+    install -d ${D}${sysconfdir}/init.d
+    install xserver-nodm ${D}${sysconfdir}/init.d
     if [ "${ROOTLESS_X}" = "1" ] ; then
-        install -d ${D}/etc/X11
-        install Xusername ${D}/etc/X11
+        install -d ${D}${sysconfdir}/X11
+        install Xusername ${D}${sysconfdir}/X11
     fi
 }
 
-- 
1.7.7.6

[PATCH 24/30] lsbinitscripts: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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/lsbinitscripts_9.03.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
index 8071916..3fef5c3 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
@@ -22,6 +22,6 @@ ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions"
 do_configure[noexec] = "1" 
 
 do_install(){
-	install -d ${D}/etc/init.d/
-	install -m 0755 ${S}/rc.d/init.d/functions ${D}/etc/init.d/functions
+	install -d ${D}${sysconfdir}/init.d/
+	install -m 0755 ${S}/rc.d/init.d/functions ${D}${sysconfdir}/init.d/functions
 }
-- 
1.7.7.6

[PATCH 25/30] xinetd: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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/xinetd/xinetd_2.3.15.bb |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index 579c28b..2e16822 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -39,12 +39,12 @@ do_install() {
 	# but since we only want two files why not override
 	# do_install from autotools and doing it ourselfs?
 	install -d "${D}${sbindir}"
-	install -d "${D}/etc/init.d"
-	install -d "${D}/etc/xinetd.d"
-	install -d "${D}/etc/default"
-	install -m 644 "${WORKDIR}/xinetd.conf" "${D}/etc"
-	install -m 755 "${WORKDIR}/xinetd.init" "${D}/etc/init.d/xinetd"
-	install -m 644 "${WORKDIR}/xinetd.default" "${D}/etc/default/xinetd"
+	install -d "${D}${sysconfdir}/init.d"
+	install -d "${D}${sysconfdir}/xinetd.d"
+	install -d "${D}${sysconfdir}/default"
+	install -m 644 "${WORKDIR}/xinetd.conf" "${D}${sysconfdir}"
+	install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd"
+	install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd"
 	install -m 755 "${S}/xinetd/xinetd" "${D}${sbindir}"
 	install -m 755 "${S}/xinetd/itox" "${D}${sbindir}"
 }
-- 
1.7.7.6

[PATCH 26/30] usbinit: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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-bsp/usbinit/usbinit.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-bsp/usbinit/usbinit.bb b/meta/recipes-bsp/usbinit/usbinit.bb
index e2a036e..5baa49a 100644
--- a/meta/recipes-bsp/usbinit/usbinit.bb
+++ b/meta/recipes-bsp/usbinit/usbinit.bb
@@ -10,9 +10,9 @@ SRC_URI = "file://usb-gether \
 S = "${WORKDIR}"
 
 do_install() {
-    install -d ${D}/etc
-    install -d ${D}/etc/init.d
-    install usb-gether ${D}/etc/init.d
+    install -d ${D}${sysconfdir}
+    install -d ${D}${sysconfdir}/init.d
+    install usb-gether ${D}${sysconfdir}/init.d
 }
 
 inherit update-rc.d allarch
-- 
1.7.7.6

[PATCH 27/30] qemu-config: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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-bsp/qemu-config/qemu-config.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index 56ee465..a57d82c 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -28,8 +28,8 @@ do_install() {
     install -d ${D}${datadir}/applications
     install -m 0644 shutdown.desktop ${D}${datadir}/applications/
 
-    install -d ${D}/etc/init.d
-    install qemu-autostart ${D}/etc/init.d/
+    install -d ${D}${sysconfdir}/init.d
+    install qemu-autostart ${D}${sysconfdir}/init.d/
 }
 
 pkg_postinst_${PN} () {
-- 
1.7.7.6

[PATCH 28/30] rsync: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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-devtools/rsync/rsync_2.6.9.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb
index 74d10e4..634ad1a 100644
--- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb
+++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb
@@ -13,8 +13,8 @@ SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \
 inherit autotools
 
 do_install_append() {
-	install -d ${D}/etc
-	install -m 0644 ${WORKDIR}/rsyncd.conf ${D}/etc
+	install -d ${D}${sysconfdir}
+	install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir}
 }
 
 EXTRA_OEMAKE='STRIP=""'
-- 
1.7.7.6

[PATCH 29/30] chkconfig: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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>
---
 .../recipes-extended/chkconfig/chkconfig_1.3.58.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index 17987a6..ae55e36 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -24,6 +24,6 @@ inherit autotools gettext
 EXTRA_OEMAKE += 'MANDIR="${mandir}" BINDIR="${base_sbindir}" SBINDIR="${sbindir}"'
 
 do_install_append() {
-    mkdir -p ${D}/etc/chkconfig.d
+    mkdir -p ${D}${sysconfdir}/chkconfig.d
     rm -f ${D}${sbindir}/update-alternatives
 }
-- 
1.7.7.6

[PATCH 30/30] man: use ${sysconfdir} instead of /etc for packaging

[Javier Martinez Canillas]

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/man/man_1.6f.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6f.bb
index ee3d648..c8b3f40 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -51,10 +51,10 @@ fakeroot do_install() {
 }
 
 do_install_append(){
-	mkdir -p  ${D}/etc/
+	mkdir -p  ${D}${sysconfdir}
         mkdir -p ${D}${datadir}/man/man5
         mkdir -p ${D}${datadir}/man/man7
-	cp ${S}/src/man.conf ${D}/etc/
+	cp ${S}/src/man.conf ${D}${sysconfdir}
         cp ${WORKDIR}/man.1.gz ${D}${datadir}/man/man1/
         cp ${WORKDIR}/man.7.gz ${D}${datadir}/man/man7/
         cp ${WORKDIR}/manpath.5.gz ${D}${datadir}/man/man5/
-- 
1.7.7.6

Re: [PATCH 00/30] cleanup: use variables instead of hardcoded paths

[Otavio Salvador]

On Sun, Aug 5, 2012 at 12:53 PM, Javier Martinez Canillas
<javier@dowhile0.org> wrote:
> Also, I didn't increment the PR on the recipes since the modifications
> don't introduce a semantic change on them.

This is wrong; if the distro changes the variable value then it does
change semantic. Please change PR on them.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [PATCH 00/30] cleanup: use variables instead of hardcoded paths

[Khem Raj]

Javier

On Sun, Aug 5, 2012 at 11:16 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Sun, Aug 5, 2012 at 12:53 PM, Javier Martinez Canillas
> <javier@dowhile0.org> wrote:
>> Also, I didn't increment the PR on the recipes since the modifications
>> don't introduce a semantic change on them.
>


thanks for doing this work. highly appreciated. However some distros
use flattened tree meaning no usr/
so for them it will be a packaging change. So as Otavio said, it will
need pr bumps.

> This is wrong; if the distro changes the variable value then it does
> change semantic. Please change PR on them.
>
> --
> Otavio Salvador                             O.S. Systems
> E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
> Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 00/30] cleanup: use variables instead of hardcoded paths

[Javier Martinez Canillas]

On Sun, Aug 5, 2012 at 9:10 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Javier
>
> On Sun, Aug 5, 2012 at 11:16 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> On Sun, Aug 5, 2012 at 12:53 PM, Javier Martinez Canillas
>> <javier@dowhile0.org> wrote:
>>> Also, I didn't increment the PR on the recipes since the modifications
>>> don't introduce a semantic change on them.
>>
>
>
> thanks for doing this work. highly appreciated. However some distros
> use flattened tree meaning no usr/
> so for them it will be a packaging change. So as Otavio said, it will
> need pr bumps.
>
>> This is wrong; if the distro changes the variable value then it does
>> change semantic. Please change PR on them.
>>
>> --

Hi,

Thanks a lot for pointing me out this issue.

I'll prepare a v2 then with the recipes PR version bump and also I'll
squash changes for the same recipe as one patch.

Best regards,
Javier