* [PATCH 1/3] lsb 4.1: Deal with "make clean" breakage
@ 2014-11-04 13:40 Koen Kooi
2014-11-04 13:40 ` [PATCH 2/3] lsb 4.1: fix /usr/lib/ hardcodes Koen Kooi
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Koen Kooi @ 2014-11-04 13:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
LSB can't cope with a "make clean" so disable that
newly enabled functionality.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
---
meta/recipes-extended/lsb/lsb_4.1.bb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index d265731..34a70d0 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -21,6 +21,12 @@ SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172"
S = "${WORKDIR}/lsb-release-1.4"
+# 'make clean' isn't supported
+
+do_configure() {
+ :
+}
+
do_install(){
oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D}
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] lsb 4.1: fix /usr/lib/ hardcodes
2014-11-04 13:40 [PATCH 1/3] lsb 4.1: Deal with "make clean" breakage Koen Kooi
@ 2014-11-04 13:40 ` Koen Kooi
2014-11-04 14:52 ` Mark Hatle
2014-11-04 13:40 ` [PATCH 3/3] lsb 4.1: fix indentation Koen Kooi
2014-11-05 10:48 ` [PATCH 1/3] lsb 4.1: Deal with "make clean" breakage Richard Purdie
2 siblings, 1 reply; 5+ messages in thread
From: Koen Kooi @ 2014-11-04 13:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
Also collapse do_install and do_install_append.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
---
meta/recipes-extended/lsb/lsb_4.1.bb | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index 34a70d0..897520a 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -72,9 +72,7 @@ do_install(){
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}${sysconfdir}/core-lsb
install -d ${D}/${baselib}/lsb
for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon
@@ -84,9 +82,9 @@ do_install_append(){
install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
# creat links for LSB test
- install -d ${D}/usr/lib/lsb
- ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
- ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd
+ install -d ${D}${libdir}/lsb
+ ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/install_initd
+ ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/remove_initd
install -d ${D}/${libdir}
ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
@@ -120,8 +118,9 @@ do_install_append(){
ln -sf ld.so.1 ld-lsb-ppc32.so.3
fi
}
+
FILES_${PN} += "/lib64 \
- /usr/lib/lsb \
+ ${libdir}/lsb \
${base_libdir}/lsb/* \
${libdir}/sendmail \
"
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] lsb 4.1: fix indentation
2014-11-04 13:40 [PATCH 1/3] lsb 4.1: Deal with "make clean" breakage Koen Kooi
2014-11-04 13:40 ` [PATCH 2/3] lsb 4.1: fix /usr/lib/ hardcodes Koen Kooi
@ 2014-11-04 13:40 ` Koen Kooi
2014-11-05 10:48 ` [PATCH 1/3] lsb 4.1: Deal with "make clean" breakage Richard Purdie
2 siblings, 0 replies; 5+ messages in thread
From: Koen Kooi @ 2014-11-04 13:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
Shell methods use tabs, variables use spaces.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
---
meta/recipes-extended/lsb/lsb_4.1.bb | 96 ++++++++++++++++++------------------
1 file changed, 48 insertions(+), 48 deletions(-)
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index 897520a..b35796d 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -15,7 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar
file://lsb_log_message \
file://lsb_pidofproc \
file://lsb_start_daemon \
- "
+ "
SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172"
@@ -73,54 +73,54 @@ do_install(){
touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc64
fi
- 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}${sysconfdir}/core-lsb
- done
- install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
-
- # creat links for LSB test
- install -d ${D}${libdir}/lsb
- ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/install_initd
- ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/remove_initd
- install -d ${D}/${libdir}
- ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
-
- if [ "${TARGET_ARCH}" = "x86_64" ];then
- cd ${D}
- if [ "${baselib}" != "lib64" ]; then
- ln -sf ${baselib} lib64
- fi
- cd ${D}/${baselib}
- ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
- ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
- fi
- if [ "${TARGET_ARCH}" = "i586" ];then
- cd ${D}/${baselib}
- ln -sf ld-linux.so.2 ld-lsb.so.2
- ln -sf ld-linux.so.2 ld-lsb.so.3
- fi
-
- if [ "${TARGET_ARCH}" = "powerpc64" ];then
- cd ${D}
- if [ "${baselib}" != "lib64" ]; then
- ln -sf ${baselib} lib64
- fi
- cd ${D}/${baselib}
- ln -sf ld64.so.1 ld-lsb-ppc64.so.2
- ln -sf ld64.so.1 ld-lsb-ppc64.so.3
- fi
- if [ "${TARGET_ARCH}" = "powerpc" ];then
- cd ${D}/${baselib}
- ln -sf ld.so.1 ld-lsb-ppc32.so.2
- ln -sf ld.so.1 ld-lsb-ppc32.so.3
- fi
+ 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}${sysconfdir}/core-lsb
+ done
+ install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
+
+ # creat links for LSB test
+ install -d ${D}${libdir}/lsb
+ ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/install_initd
+ ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/remove_initd
+ install -d ${D}/${libdir}
+ ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
+
+ if [ "${TARGET_ARCH}" = "x86_64" ];then
+ cd ${D}
+ if [ "${baselib}" != "lib64" ]; then
+ ln -sf ${baselib} lib64
+ fi
+ cd ${D}/${baselib}
+ ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
+ ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
+ fi
+ if [ "${TARGET_ARCH}" = "i586" ];then
+ cd ${D}/${baselib}
+ ln -sf ld-linux.so.2 ld-lsb.so.2
+ ln -sf ld-linux.so.2 ld-lsb.so.3
+ fi
+
+ if [ "${TARGET_ARCH}" = "powerpc64" ];then
+ cd ${D}
+ if [ "${baselib}" != "lib64" ]; then
+ ln -sf ${baselib} lib64
+ fi
+ cd ${D}/${baselib}
+ ln -sf ld64.so.1 ld-lsb-ppc64.so.2
+ ln -sf ld64.so.1 ld-lsb-ppc64.so.3
+ fi
+ if [ "${TARGET_ARCH}" = "powerpc" ];then
+ cd ${D}/${baselib}
+ ln -sf ld.so.1 ld-lsb-ppc32.so.2
+ ln -sf ld.so.1 ld-lsb-ppc32.so.3
+ fi
}
FILES_${PN} += "/lib64 \
- ${libdir}/lsb \
+ ${libdir}/lsb \
${base_libdir}/lsb/* \
- ${libdir}/sendmail \
- "
+ ${libdir}/sendmail \
+ "
--
1.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] lsb 4.1: fix /usr/lib/ hardcodes
2014-11-04 13:40 ` [PATCH 2/3] lsb 4.1: fix /usr/lib/ hardcodes Koen Kooi
@ 2014-11-04 14:52 ` Mark Hatle
0 siblings, 0 replies; 5+ messages in thread
From: Mark Hatle @ 2014-11-04 14:52 UTC (permalink / raw)
To: openembedded-core
On 11/4/14, 7:40 AM, Koen Kooi wrote:
> Also collapse do_install and do_install_append.
/usr/lib is hard coded for a reason. The LSB specification says the files must
be installed in /usr/lib/lsb. (If this has changed, great, but it was true
through at least early last year.)
--Mark
> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
> ---
> meta/recipes-extended/lsb/lsb_4.1.bb | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
> index 34a70d0..897520a 100644
> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
> @@ -72,9 +72,7 @@ do_install(){
> 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}${sysconfdir}/core-lsb
> install -d ${D}/${baselib}/lsb
> for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon
> @@ -84,9 +82,9 @@ do_install_append(){
> install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
>
> # creat links for LSB test
> - install -d ${D}/usr/lib/lsb
> - ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/install_initd
> - ln -sf ${sbindir}/chkconfig ${D}/usr/lib/lsb/remove_initd
> + install -d ${D}${libdir}/lsb
> + ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/install_initd
> + ln -sf ${sbindir}/chkconfig ${D}${libdir}/lsb/remove_initd
> install -d ${D}/${libdir}
> ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
>
> @@ -120,8 +118,9 @@ do_install_append(){
> ln -sf ld.so.1 ld-lsb-ppc32.so.3
> fi
> }
> +
> FILES_${PN} += "/lib64 \
> - /usr/lib/lsb \
> + ${libdir}/lsb \
> ${base_libdir}/lsb/* \
> ${libdir}/sendmail \
> "
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] lsb 4.1: Deal with "make clean" breakage
2014-11-04 13:40 [PATCH 1/3] lsb 4.1: Deal with "make clean" breakage Koen Kooi
2014-11-04 13:40 ` [PATCH 2/3] lsb 4.1: fix /usr/lib/ hardcodes Koen Kooi
2014-11-04 13:40 ` [PATCH 3/3] lsb 4.1: fix indentation Koen Kooi
@ 2014-11-05 10:48 ` Richard Purdie
2 siblings, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2014-11-05 10:48 UTC (permalink / raw)
To: Koen Kooi; +Cc: openembedded-core
On Tue, 2014-11-04 at 14:40 +0100, Koen Kooi wrote:
> LSB can't cope with a "make clean" so disable that
> newly enabled functionality.
>
> Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
> ---
> meta/recipes-extended/lsb/lsb_4.1.bb | 6 ++++++
> 1 file changed, 6 insertions(+)
In the interests of being clear and transparent, there are issues with
the clean change and I think we need a better mechanism for controlling
this. I've a patch in progress which introduces a CLEANBROKEN variable
which can be set in recipes where "make clean" is broken.
I have a list of several other recipes with the issue and am working on
pulling together a list/patch.
Cheers,
Richard
> diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
> index d265731..34a70d0 100644
> --- a/meta/recipes-extended/lsb/lsb_4.1.bb
> +++ b/meta/recipes-extended/lsb/lsb_4.1.bb
> @@ -21,6 +21,12 @@ SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4"
> SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172"
> S = "${WORKDIR}/lsb-release-1.4"
>
> +# 'make clean' isn't supported
> +
> +do_configure() {
> + :
> +}
> +
> do_install(){
> oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D}
>
> --
> 1.9.3
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-11-05 10:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-04 13:40 [PATCH 1/3] lsb 4.1: Deal with "make clean" breakage Koen Kooi
2014-11-04 13:40 ` [PATCH 2/3] lsb 4.1: fix /usr/lib/ hardcodes Koen Kooi
2014-11-04 14:52 ` Mark Hatle
2014-11-04 13:40 ` [PATCH 3/3] lsb 4.1: fix indentation Koen Kooi
2014-11-05 10:48 ` [PATCH 1/3] lsb 4.1: Deal with "make clean" breakage Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox