* (No subject)
@ 2012-08-05 19:48 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
` (28 more replies)
0 siblings, 29 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 second version of a big patch-set that does a cleanup and replace
the hardcoded paths used on these recipes with the build system 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, the patches increment the recipes PR since the a distro config can
set the variables to a different value.
Changes since v1:
- Bump recipes PR as suggested by Otavio Salvador and Khem Raj
- Squash ${base_bindir} and ${sysconfdir} changes for xinetd and lsb
recipes so the PR number gets incremented only once.
The patch-set consist of the following patches:
[PATCH v2 01/28] xinetd: use ${sbindir} and ${sysconfdir} instead of
[PATCH v2 02/28] alsa-state: use ${sbindir} instead of /usr/sbin for
[PATCH v2 03/28] lsbsetup: use ${bindir} instead of /usr/bin for
[PATCH v2 04/28] sudo: use ${bindir} and ${sysconfdir} instead of
[PATCH v2 05/28] lsbtest: use ${bindir} instead of /usr/bin for
[PATCH v2 06/28] cronie: use variables instead of hardcoded paths
[PATCH v2 07/28] useradd-example: use ${datadir} instead of
[PATCH v2 08/28] ubootchart: use variables instead of hardcoded
[PATCH v2 09/28] xkeyboard-config: use ${datadir} instead of
[PATCH v2 10/28] systemtap: use ${datadir} instead of /usr/share for
[PATCH v2 11/28] lsb: use ${base_bindir} and ${sysconfdir} instead
[PATCH v2 12/28] mingetty: use ${base_sbindir} instead of /sbin for
[PATCH v2 13/28] external-sourcery: use ${prefix} and ${libdir}
[PATCH v2 14/28] rpm: use ${localstatedir} and ${libdir} instead of
[PATCH v2 15/28] at: use ${base_sbindir} instead of /sbin for
[PATCH v2 16/28] kernel.bbclass: use ${base_libdir} and
[PATCH v2 17/28] linux-firware: use ${base_libdir} instead of /lib
[PATCH v2 18/28] openssh: use ${localstatedir} instead of /var for
[PATCH v2 19/28] libpam: use ${localstatedir} and ${sysconfdir}
[PATCH v2 20/28] x11-common: use ${sysconfdir} instead of /etc for
[PATCH v2 21/28] builder: use ${sysconfdir} instead of /etc for
[PATCH v2 22/28] xserver-nodm-init: use ${sysconfdir} instead of
[PATCH v2 23/28] lsbinitscripts: use ${sysconfdir} instead of /etc
[PATCH v2 24/28] usbinit: use ${sysconfdir} instead of /etc for
[PATCH v2 25/28] qemu-config: use ${sysconfdir} instead of /etc for
[PATCH v2 26/28] rsync: use ${sysconfdir} instead of /etc for
[PATCH v2 27/28] chkconfig: use ${sysconfdir} instead of /etc for
[PATCH v2 28/28] man: use ${sysconfdir} instead of /etc for
Best regards,
Javier
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 01/28] xinetd: use ${sbindir} and ${sysconfdir} instead of /usr/sbin and /etc
2012-08-05 19:48 (No subject) Javier Martinez Canillas
@ 2012-08-05 19:48 ` 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
` (27 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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..2139e74 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
DEPENDS = ""
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
file://xinetd.init \
@@ -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}/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 -d "${D}${sbindir}"
+ 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}"
}
CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 02/28] alsa-state: use ${sbindir} instead of /usr/sbin for packaging
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 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 03/28] lsbsetup: use ${bindir} instead of /usr/bin " Javier Martinez Canillas
` (26 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb
index 83c9faa..a9cc04c 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/meta/recipes-bsp/alsa-state/alsa-state.bb
@@ -10,7 +10,7 @@ sound state at system boot and save it at system shut down."
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PV = "0.2.0"
-PR = "r2"
+PR = "r3"
SRC_URI = "\
file://asound.conf \
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 03/28] lsbsetup: use ${bindir} instead of /usr/bin for packaging
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 ` 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
` (25 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsbsetup_1.0.bb b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
index 9172ee3..2792d51 100644
--- a/meta/recipes-extended/lsb/lsbsetup_1.0.bb
+++ b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "auto-setup environment for lsb test"
SECTION = "console/utils"
LICENSE = "GPLv2"
-PR = "r3"
+PR = "r4"
LIC_FILES_CHKSUM = "file://LSB_Setup.sh;beginline=3;endline=16;md5=97451c7c0786ce5bbe9ac58042945583"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 04/28] sudo: use ${bindir} and ${sysconfdir} instead of /usr/bin and /etc
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (2 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 03/28] lsbsetup: use ${bindir} instead of /usr/bin " Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 05/28] lsbtest: use ${bindir} instead of /usr/bin for packaging Javier Martinez Canillas
` (24 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 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..4e4a443 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.5p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.5p2.bb
@@ -1,6 +1,6 @@
require sudo.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
file://libtool.patch \
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 05/28] lsbtest: use ${bindir} instead of /usr/bin for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (3 preceding siblings ...)
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 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 06/28] cronie: use variables instead of hardcoded paths Javier Martinez Canillas
` (23 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsbtest_1.0.bb b/meta/recipes-extended/lsb/lsbtest_1.0.bb
index 1191164..5ebea53 100644
--- a/meta/recipes-extended/lsb/lsbtest_1.0.bb
+++ b/meta/recipes-extended/lsb/lsbtest_1.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "automate test for lsb"
SECTION = "console/utils"
LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
LIC_FILES_CHKSUM = "file://LSB_Test.sh;beginline=3;endline=16;md5=7063bb54b04719df0716b513447f4fc0"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 06/28] cronie: use variables instead of hardcoded paths
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (4 preceding siblings ...)
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 ` 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
` (22 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..ce59437 100644
--- a/meta/recipes-extended/cronie/cronie_1.4.8.bb
+++ b/meta/recipes-extended/cronie/cronie_1.4.8.bb
@@ -18,7 +18,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}"
PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
-PR = "r2"
+PR = "r3"
SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
file://crond.init \
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 07/28] useradd-example: use ${datadir} instead of /usr/share for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (5 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 06/28] cronie: use variables instead of hardcoded paths Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 08/28] ubootchart: use variables instead of hardcoded paths Javier Martinez Canillas
` (21 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 36 ++++++++++----------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
index b10c1d0..53d2340 100644
--- a/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
+++ b/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
@@ -1,7 +1,7 @@
SUMMARY = "Example recipe for using inherit useradd"
DESCRIPTION = "This recipe serves as an example for using features from useradd.bbclass"
SECTION = "examples"
-PR = "r0"
+PR = "r1"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 08/28] ubootchart: use variables instead of hardcoded paths
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (6 preceding siblings ...)
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 ` 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
` (20 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
index b49e94a..843024c 100644
--- a/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
+++ b/meta/recipes-devtools/ubootchart/ubootchart_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
SRCREV = "12"
PV = "0.0+r${SRCPV}"
-PR = "r5"
+PR = "r6"
#RRECOMMENDS_${PN} = "acct"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 09/28] xkeyboard-config: use ${datadir} instead of /usr/share for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (7 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 08/28] ubootchart: use variables instead of hardcoded paths Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 10/28] systemtap: " Javier Martinez Canillas
` (19 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 4 ++--
1 files changed, 2 insertions(+), 2 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..1b28208 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.1.bb
@@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "e293aa4b0dd259dbb4f0e7f56fdd95db5047d052c7b3b80922fe566392
SECTION = "x11/libs"
DEPENDS = "intltool-native xkbcomp-native glib-2.0"
-PR = "r1"
+PR = "r2"
EXTRA_OECONF = "--with-xkb-rules-symlink=xorg"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 10/28] systemtap: use ${datadir} instead of /usr/share for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (8 preceding siblings ...)
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 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 11/28] lsb: use ${base_bindir} and ${sysconfdir} instead of /bin and /etc Javier Martinez Canillas
` (18 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
index b328e6b..0cfcbe4 100644
--- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
@@ -4,7 +4,7 @@ require systemtap_git.inc
DEPENDS = "systemtap virtual/kernel"
-PR = "r0"
+PR = "r1"
# On systems without CONFIG_UTRACE, this package is empty.
ALLOW_EMPTY_${PN} = "1"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 11/28] lsb: use ${base_bindir} and ${sysconfdir} instead of /bin and /etc
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (9 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 10/28] systemtap: " Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 12/28] mingetty: use ${base_sbindir} instead of /sbin for packaging Javier Martinez Canillas
` (17 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 12/28] mingetty: use ${base_sbindir} instead of /sbin for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (10 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 11/28] lsb: use ${base_bindir} and ${sysconfdir} instead of /bin and /etc Javier Martinez Canillas
@ 2012-08-05 19:48 ` 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
` (16 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/mingetty/mingetty_1.08.bb b/meta/recipes-extended/mingetty/mingetty_1.08.bb
index fed5dfd..a1f9eb2 100644
--- a/meta/recipes-extended/mingetty/mingetty_1.08.bb
+++ b/meta/recipes-extended/mingetty/mingetty_1.08.bb
@@ -2,7 +2,7 @@ DESCRIPTION = " A compact getty program for virtual consoles only"
SECTION = "console/utils"
HOMEPAGE = "http://sourceforge.net/projects/mingetty/"
LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e"
SRC_URI = "http://cdnetworks-kr-1.dl.sourceforge.net/project/mingetty/mingetty/${PV}/mingetty-${PV}.tar.gz"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 13/28] external-sourcery: use ${prefix} and ${libdir} instead of /usr and /usr/lib
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (11 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 12/28] mingetty: use ${base_sbindir} instead of /sbin for packaging Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 21:34 ` Chris Larson
2012-08-05 19:48 ` [PATCH v2 14/28] rpm: use ${localstatedir} and ${libdir} instead of /var " Javier Martinez Canillas
` (15 subsequent siblings)
28 siblings, 1 reply; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
index 74c82ec..1def79e 100644
--- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
+++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
@@ -24,7 +24,7 @@ PROVIDES += "\
virtual/linux-libc-headers \
"
PV = "${CSL_VER_MAIN}"
-PR = "r7"
+PR = "r8"
#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/${CSL_TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 14/28] rpm: use ${localstatedir} and ${libdir} instead of /var and /usr/lib
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (12 preceding siblings ...)
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 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 15/28] at: use ${base_sbindir} instead of /sbin for packaging Javier Martinez Canillas
` (14 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 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..60541f4 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "libpcre attr acl popt ossp-uuid file"
-PR = "r46"
+PR = "r47"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 15/28] at: use ${base_sbindir} instead of /sbin for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (13 preceding siblings ...)
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 ` 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
` (13 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 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..ab20eb8 100644
--- a/meta/recipes-extended/at/at_3.1.13.bb
+++ b/meta/recipes-extended/at/at_3.1.13.bb
@@ -11,7 +11,7 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-env pam-plugin-limits"
RCONFLICTS_${PN} = "atd"
RREPLACES_${PN} = "atd"
-PR = "r1"
+PR = "r2"
SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
file://configure.patch \
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 16/28] kernel.bbclass: use ${base_libdir} and ${sysconfdir} instead of /lib and /etc
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (14 preceding siblings ...)
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 ` Javier Martinez Canillas
2012-08-06 16:14 ` Darren Hart
2012-08-05 19:48 ` [PATCH v2 17/28] linux-firware: use ${base_libdir} instead of /lib for packaging Javier Martinez Canillas
` (12 subsequent siblings)
28 siblings, 1 reply; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 17/28] linux-firware: use ${base_libdir} instead of /lib for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (15 preceding siblings ...)
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-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 18/28] openssh: use ${localstatedir} instead of /var " Javier Martinez Canillas
` (11 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 36 ++++++++++----------
1 files changed, 18 insertions(+), 18 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..5b93975 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -22,7 +22,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \
SRCREV = "e98750f0d68d0037ce5a186f7f863a9c13bf773a"
PE = "1"
PV = "0.0+git${SRCPV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 18/28] openssh: use ${localstatedir} instead of /var for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (16 preceding siblings ...)
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 ` 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
` (10 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
index 376023c..8757f82 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
-PR = "r2"
+PR = "r3"
DEPENDS = "zlib openssl"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 19/28] libpam: use ${localstatedir} and ${sysconfdir} instead of /var and /etc
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (17 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 18/28] openssh: use ${localstatedir} instead of /var " Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 20/28] x11-common: use ${sysconfdir} instead of /etc for packaging Javier Martinez Canillas
` (9 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 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..c035aaf 100644
--- a/meta/recipes-extended/pam/libpam_1.1.5.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.5.bb
@@ -9,7 +9,7 @@ SECTION = "base"
LICENSE = "GPLv2+ | BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083"
-PR = "r4"
+PR = "r5"
SRC_URI = "https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${PV}.tar.bz2 \
file://99_pam \
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 20/28] x11-common: use ${sysconfdir} instead of /etc for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (18 preceding siblings ...)
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 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 21/28] builder: " Javier Martinez Canillas
` (8 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 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..2675145 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and configuration files"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
-PR = "r44"
+PR = "r45"
SRC_URI = "file://etc \
file://gplv2-license.patch"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 21/28] builder: use ${sysconfdir} instead of /etc for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (19 preceding siblings ...)
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 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 22/28] xserver-nodm-init: " Javier Martinez Canillas
` (7 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/builder/builder_0.1.bb b/meta/recipes-graphics/builder/builder_0.1.bb
index cb5f440..5c12c14 100644
--- a/meta/recipes-graphics/builder/builder_0.1.bb
+++ b/meta/recipes-graphics/builder/builder_0.1.bb
@@ -1,7 +1,7 @@
SUMMARY = "New user to do specific job"
DESCRIPTION = "This recipe create a new user named ${PN}, who is used for specific jobs like building. The task can be auto started via mini X"
SECTION = "x11"
-PR = "r3"
+PR = "r4"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://builder_hob_start.sh;endline=5;md5=84796c3c41785d86100fdabcbdade00e"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 22/28] xserver-nodm-init: use ${sysconfdir} instead of /etc for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (20 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 21/28] builder: " Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 23/28] lsbinitscripts: " Javier Martinez Canillas
` (6 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..eab76c5 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
-PR = "r29"
+PR = "r30"
RDEPENDS_${PN} = "sudo"
SRC_URI = "file://xserver-nodm \
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 23/28] lsbinitscripts: use ${sysconfdir} instead of /etc for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (21 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 22/28] xserver-nodm-init: " Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 24/28] usbinit: " Javier Martinez Canillas
` (5 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
index 8071916..eac4ebb 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.03.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "SysV init scripts which only is used in an LSB image"
SECTION = "base"
LICENSE = "GPLv2"
DEPENDS = "popt glib-2.0"
-PR = "r2"
+PR = "r3"
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 24/28] usbinit: use ${sysconfdir} instead of /etc for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (22 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 23/28] lsbinitscripts: " Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 25/28] qemu-config: " Javier Martinez Canillas
` (4 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-bsp/usbinit/usbinit.bb b/meta/recipes-bsp/usbinit/usbinit.bb
index e2a036e..37e3b16 100644
--- a/meta/recipes-bsp/usbinit/usbinit.bb
+++ b/meta/recipes-bsp/usbinit/usbinit.bb
@@ -3,16 +3,16 @@ DESCRIPTION = "Initscript to manage gadget Ethernet"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://usb-gether \
file://COPYING.GPL"
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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 25/28] qemu-config: use ${sysconfdir} instead of /etc for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (23 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 24/28] usbinit: " Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 26/28] rsync: " Javier Martinez Canillas
` (3 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index 56ee465..8305f3a 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
-PR = "r24"
+PR = "r25"
SRC_URI = "file://distcc.sh \
file://anjuta-remote-run \
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 26/28] rsync: use ${sysconfdir} instead of /etc for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (24 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 25/28] qemu-config: " Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 27/28] chkconfig: " Javier Martinez Canillas
` (2 subsequent siblings)
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 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..54feada 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=""'
@@ -22,4 +22,4 @@ EXTRA_OEMAKE='STRIP=""'
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c"
-PR = "r3"
+PR = "r4"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 27/28] chkconfig: use ${sysconfdir} instead of /etc for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (25 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 26/28] rsync: " Javier Martinez Canillas
@ 2012-08-05 19:48 ` 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
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 4 ++--
1 files changed, 2 insertions(+), 2 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..9e0e1a0 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
DEPENDS = "libnewt popt"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 28/28] man: use ${sysconfdir} instead of /etc for packaging
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (26 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 27/28] chkconfig: " Javier Martinez Canillas
@ 2012-08-05 19:48 ` Javier Martinez Canillas
2012-08-06 14:59 ` (No subject) Richard Purdie
28 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 19:48 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/man/man_1.6f.bb b/meta/recipes-extended/man/man_1.6f.bb
index ee3d648..9f75307 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
SECTION = "console/utils"
HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
DEPENDS = "groff less"
@@ -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
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH v2 13/28] external-sourcery: use ${prefix} and ${libdir} instead of /usr and /usr/lib
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
0 siblings, 1 reply; 36+ messages in thread
From: Chris Larson @ 2012-08-05 21:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sun, Aug 5, 2012 at 12:48 PM, Javier Martinez Canillas
<javier@dowhile0.org> 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/external-sourcery-toolchain.bb | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
> index 74c82ec..1def79e 100644
> --- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
> +++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
> @@ -24,7 +24,7 @@ PROVIDES += "\
> virtual/linux-libc-headers \
> "
> PV = "${CSL_VER_MAIN}"
> -PR = "r7"
> +PR = "r8"
>
> #SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/${CSL_TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2"
>
> @@ -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}
This is wrong. This line creates usr/lib *explicitly* to cover the
case where libdir is set to something else (e.g. usr/lib64). As the
comment says, the toolchain will fail to search the real libdir if the
usr/lib dir does not exist.
--
Christopher Larson
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 13/28] external-sourcery: use ${prefix} and ${libdir} instead of /usr and /usr/lib
2012-08-05 21:34 ` Chris Larson
@ 2012-08-05 21:53 ` Javier Martinez Canillas
0 siblings, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-05 21:53 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sun, Aug 5, 2012 at 11:34 PM, Chris Larson <clarson@kergoth.com> wrote:
> On Sun, Aug 5, 2012 at 12:48 PM, Javier Martinez Canillas
> <javier@dowhile0.org> 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/external-sourcery-toolchain.bb | 8 ++++----
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-core/meta/external-sourcery-toolchain.bb b/meta/recipes-core/meta/external-sourcery-toolchain.bb
>> index 74c82ec..1def79e 100644
>> --- a/meta/recipes-core/meta/external-sourcery-toolchain.bb
>> +++ b/meta/recipes-core/meta/external-sourcery-toolchain.bb
>> @@ -24,7 +24,7 @@ PROVIDES += "\
>> virtual/linux-libc-headers \
>> "
>> PV = "${CSL_VER_MAIN}"
>> -PR = "r7"
>> +PR = "r8"
>>
>> #SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/${CSL_TARGET_SYS}/arm-${PV}-${TARGET_PREFIX}i686-pc-linux-gnu.tar.bz2"
>>
>> @@ -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}
>
>
> This is wrong. This line creates usr/lib *explicitly* to cover the
> case where libdir is set to something else (e.g. usr/lib64). As the
> comment says, the toolchain will fail to search the real libdir if the
> usr/lib dir does not exist.
> --
> Christopher Larson
>
Hi Christopher,
Thanks for explaining me this, I didn't know that libdir weren't use on purpose.
This patch can be discarded from the patch-set then.
Best regards,
Javier
^ permalink raw reply [flat|nested] 36+ messages in thread
* (No subject)
2012-08-05 19:48 (No subject) Javier Martinez Canillas
` (27 preceding siblings ...)
2012-08-05 19:48 ` [PATCH v2 28/28] man: " Javier Martinez Canillas
@ 2012-08-06 14:59 ` Richard Purdie
28 siblings, 0 replies; 36+ messages in thread
From: Richard Purdie @ 2012-08-06 14:59 UTC (permalink / raw)
To: Javier Martinez Canillas; +Cc: openembedded-core
On Sun, 2012-08-05 at 21:48 +0200, Javier Martinez Canillas wrote:
> 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 second version of a big patch-set that does a cleanup and replace
> the hardcoded paths used on these recipes with the build system 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, the patches increment the recipes PR since the a distro config can
> set the variables to a different value.
>
> Changes since v1:
>
> - Bump recipes PR as suggested by Otavio Salvador and Khem Raj
> - Squash ${base_bindir} and ${sysconfdir} changes for xinetd and lsb
> recipes so the PR number gets incremented only once.
>
> The patch-set consist of the following patches:
>
> [PATCH v2 01/28] xinetd: use ${sbindir} and ${sysconfdir} instead of
> [PATCH v2 02/28] alsa-state: use ${sbindir} instead of /usr/sbin for
> [PATCH v2 03/28] lsbsetup: use ${bindir} instead of /usr/bin for
> [PATCH v2 04/28] sudo: use ${bindir} and ${sysconfdir} instead of
> [PATCH v2 05/28] lsbtest: use ${bindir} instead of /usr/bin for
> [PATCH v2 06/28] cronie: use variables instead of hardcoded paths
> [PATCH v2 07/28] useradd-example: use ${datadir} instead of
> [PATCH v2 08/28] ubootchart: use variables instead of hardcoded
> [PATCH v2 09/28] xkeyboard-config: use ${datadir} instead of
> [PATCH v2 10/28] systemtap: use ${datadir} instead of /usr/share for
> [PATCH v2 11/28] lsb: use ${base_bindir} and ${sysconfdir} instead
> [PATCH v2 12/28] mingetty: use ${base_sbindir} instead of /sbin for
> [PATCH v2 13/28] external-sourcery: use ${prefix} and ${libdir}
> [PATCH v2 14/28] rpm: use ${localstatedir} and ${libdir} instead of
> [PATCH v2 15/28] at: use ${base_sbindir} instead of /sbin for
> [PATCH v2 16/28] kernel.bbclass: use ${base_libdir} and
> [PATCH v2 17/28] linux-firware: use ${base_libdir} instead of /lib
> [PATCH v2 18/28] openssh: use ${localstatedir} instead of /var for
> [PATCH v2 19/28] libpam: use ${localstatedir} and ${sysconfdir}
> [PATCH v2 20/28] x11-common: use ${sysconfdir} instead of /etc for
> [PATCH v2 21/28] builder: use ${sysconfdir} instead of /etc for
> [PATCH v2 22/28] xserver-nodm-init: use ${sysconfdir} instead of
> [PATCH v2 23/28] lsbinitscripts: use ${sysconfdir} instead of /etc
> [PATCH v2 24/28] usbinit: use ${sysconfdir} instead of /etc for
> [PATCH v2 25/28] qemu-config: use ${sysconfdir} instead of /etc for
> [PATCH v2 26/28] rsync: use ${sysconfdir} instead of /etc for
> [PATCH v2 27/28] chkconfig: use ${sysconfdir} instead of /etc for
> [PATCH v2 28/28] man: use ${sysconfdir} instead of /etc for
Thanks for these, I merged most of them apart from external-sourcery
which Chris commented on, the at recipe which I found a better fix for
which removed the lines in question and the rpm change which I want to
check something out related to it first.
Cheers,
Richard
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 16/28] kernel.bbclass: use ${base_libdir} and ${sysconfdir} instead of /lib and /etc
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
0 siblings, 2 replies; 36+ messages in thread
From: Darren Hart @ 2012-08-06 16:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/05/2012 12:48 PM, Javier Martinez Canillas wrote:
Hi Javier,
> It is considered good practice to use the build system provided
> variables instead of directly specify hardcoded paths.
Have you tested this with a build using a base_libdir other than /lib ?
> 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
The install doesn't specify base_libdir, so does the kernel make system
honor it?
> - 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"
if not, these will fail.
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 16/28] kernel.bbclass: use ${base_libdir} and ${sysconfdir} instead of /lib and /etc
2012-08-06 16:14 ` Darren Hart
@ 2012-08-06 17:26 ` Javier Martinez Canillas
2012-08-07 20:04 ` Khem Raj
1 sibling, 0 replies; 36+ messages in thread
From: Javier Martinez Canillas @ 2012-08-06 17:26 UTC (permalink / raw)
To: Darren Hart; +Cc: Patches and discussions about the oe-core layer
On Mon, Aug 6, 2012 at 6:14 PM, Darren Hart <dvhart@linux.intel.com> wrote:
> On 08/05/2012 12:48 PM, Javier Martinez Canillas wrote:
>
> Hi Javier,
>
>> It is considered good practice to use the build system provided
>> variables instead of directly specify hardcoded paths.
>
> Have you tested this with a build using a base_libdir other than /lib ?
>
>> 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
>
> The install doesn't specify base_libdir, so does the kernel make system
> honor it?
>
>> - 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"
>
> if not, these will fail.
>
> --
> Darren Hart
> Intel Open Source Technology Center
> Yocto Project - Technical Lead - Linux Kernel
Hi Darren,
Yes, you are right I didn't think about it.
The kernel is a special case since you just specify the root of the
file system with INSTALL_MOD_PATH the kernel build system will
*always* create lib/modules/${KERNEL_VERSION}.
In fact now that I think about it, I don't know if you can even change
the path were the kernel modules gets installed.
So, yes the kernel is a special case and using a ${base_libdir} other
than /lib will definitely break loadable kernel modules installation.
Richard, Darren is correct and this patch is wrong, this is one of the
cases which is acceptable (and necessary) to hardcode /lib.
Thanks a lot for pointing me out this and sorry for not realizing this
before sending the patch-set.
Best regards,
Javier
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 16/28] kernel.bbclass: use ${base_libdir} and ${sysconfdir} instead of /lib and /etc
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
1 sibling, 1 reply; 36+ messages in thread
From: Khem Raj @ 2012-08-07 20:04 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, Aug 6, 2012 at 9:14 AM, Darren Hart <dvhart@linux.intel.com> wrote:
> if not, these will fail.
and it does.
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 16/28] kernel.bbclass: use ${base_libdir} and ${sysconfdir} instead of /lib and /etc
2012-08-07 20:04 ` Khem Raj
@ 2012-08-07 20:19 ` McClintock Matthew-B29882
0 siblings, 0 replies; 36+ messages in thread
From: McClintock Matthew-B29882 @ 2012-08-07 20:19 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, Aug 7, 2012 at 3:04 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Mon, Aug 6, 2012 at 9:14 AM, Darren Hart <dvhart@linux.intel.com> wrote:
>> if not, these will fail.
>
> and it does.
This is already reverted.
-M
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2012-08-07 20:31 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH v2 11/28] lsb: use ${base_bindir} and ${sysconfdir} instead of /bin and /etc Javier Martinez Canillas
2012-08-05 19:48 ` [PATCH v2 12/28] mingetty: use ${base_sbindir} instead of /sbin for packaging 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
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.