* [PATCH 1/5] curl: Use BPN instead of PN for style like lib${PN}
2011-08-18 9:08 [PATCH 0/5][PULL] multilib: Some fixes of improper ${PN} Dongxiao Xu
@ 2011-08-18 9:08 ` Dongxiao Xu
2011-08-18 9:08 ` [PATCH 2/5] ea-acl: " Dongxiao Xu
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Dongxiao Xu @ 2011-08-18 9:08 UTC (permalink / raw)
To: openembedded-core
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-support/curl/curl_7.21.7.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/curl/curl_7.21.7.bb b/meta/recipes-support/curl/curl_7.21.7.bb
index 28344e2..2ec4402 100644
--- a/meta/recipes-support/curl/curl_7.21.7.bb
+++ b/meta/recipes-support/curl/curl_7.21.7.bb
@@ -45,9 +45,9 @@ PACKAGE_ARCH_${PN}-certs = "all"
FILES_${PN}-doc = "${mandir}/man1/curl.1"
-FILES_lib${PN} = "${libdir}/lib*.so.*"
-RRECOMMENDS_lib${PN} += "${PN}-certs"
-FILES_lib${PN}-dev = "${includedir} \
+FILES_lib${BPN} = "${libdir}/lib*.so.*"
+RRECOMMENDS_lib${BPN} += "${PN}-certs"
+FILES_lib${BPN}-dev = "${includedir} \
${libdir}/lib*.so \
${libdir}/lib*.a \
${libdir}/lib*.la \
@@ -55,7 +55,7 @@ FILES_lib${PN}-dev = "${includedir} \
${datadir}/aclocal \
${bindir}/*-config"
-FILES_lib${PN}-doc = "${mandir}/man3 \
+FILES_lib${BPN}-doc = "${mandir}/man3 \
${mandir}/man1/curl-config.1"
BBCLASSEXTEND = "native nativesdk"
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/5] ea-acl: Use BPN instead of PN for style like lib${PN}
2011-08-18 9:08 [PATCH 0/5][PULL] multilib: Some fixes of improper ${PN} Dongxiao Xu
2011-08-18 9:08 ` [PATCH 1/5] curl: Use BPN instead of PN for style like lib${PN} Dongxiao Xu
@ 2011-08-18 9:08 ` Dongxiao Xu
2011-08-18 9:08 ` [PATCH 3/5] attr: " Dongxiao Xu
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Dongxiao Xu @ 2011-08-18 9:08 UTC (permalink / raw)
To: openembedded-core
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-support/attr/ea-acl.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc
index 4e79421..2ef1389 100644
--- a/meta/recipes-support/attr/ea-acl.inc
+++ b/meta/recipes-support/attr/ea-acl.inc
@@ -18,9 +18,9 @@ do_install () {
PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-doc"
-FILES_lib${PN} = "${base_libdir}/lib*.so.*"
+FILES_lib${BPN} = "${base_libdir}/lib*.so.*"
-FILES_lib${PN}-dev = "${includedir} \
+FILES_lib${BPN}-dev = "${includedir} \
${libdir}/lib*.so \
${libdir}/lib*.a \
${libdir}/lib*.la \
@@ -28,7 +28,7 @@ FILES_lib${PN}-dev = "${includedir} \
${base_libdir}/lib*.a \
${base_libdir}/lib*.la"
-FILES_lib${PN}-doc = "${mandir}/man2 \
+FILES_lib${BPN}-doc = "${mandir}/man2 \
${mandir}/man3"
BBCLASSEXTEND = "native"
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/5] attr: Use BPN instead of PN for style like lib${PN}
2011-08-18 9:08 [PATCH 0/5][PULL] multilib: Some fixes of improper ${PN} Dongxiao Xu
2011-08-18 9:08 ` [PATCH 1/5] curl: Use BPN instead of PN for style like lib${PN} Dongxiao Xu
2011-08-18 9:08 ` [PATCH 2/5] ea-acl: " Dongxiao Xu
@ 2011-08-18 9:08 ` Dongxiao Xu
2011-08-18 9:09 ` [PATCH 4/5] acl: " Dongxiao Xu
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Dongxiao Xu @ 2011-08-18 9:08 UTC (permalink / raw)
To: openembedded-core
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-support/attr/attr.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc
index c110340..6deb004 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -6,7 +6,7 @@ DEPENDS = "ncurses"
LICENSE = "LGPLv2.1+ & GPLv2+"
LICENSE_${PN} = "GPLv2+"
-LICENSE_lib${PN} = "LGPLv2.1+"
+LICENSE_lib${BPN} = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
file://attr/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \
file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb"
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] acl: Use BPN instead of PN for style like lib${PN}
2011-08-18 9:08 [PATCH 0/5][PULL] multilib: Some fixes of improper ${PN} Dongxiao Xu
` (2 preceding siblings ...)
2011-08-18 9:08 ` [PATCH 3/5] attr: " Dongxiao Xu
@ 2011-08-18 9:09 ` Dongxiao Xu
2011-08-18 9:09 ` [PATCH 5/5] procps: Fix lib path to support multilib Dongxiao Xu
2011-08-23 6:27 ` [PATCH 0/5][PULL] multilib: Some fixes of improper ${PN} Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Dongxiao Xu @ 2011-08-18 9:09 UTC (permalink / raw)
To: openembedded-core
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
meta/recipes-support/attr/acl.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/attr/acl.inc b/meta/recipes-support/attr/acl.inc
index 15a87a5..b504517 100644
--- a/meta/recipes-support/attr/acl.inc
+++ b/meta/recipes-support/attr/acl.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.1+ & GPLv2+"
LICENSE_${PN} = "GPLv2+"
-LICENSE_lib${PN} = "LGPLv2.1+"
+LICENSE_lib${BPN} = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764"
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] procps: Fix lib path to support multilib
2011-08-18 9:08 [PATCH 0/5][PULL] multilib: Some fixes of improper ${PN} Dongxiao Xu
` (3 preceding siblings ...)
2011-08-18 9:09 ` [PATCH 4/5] acl: " Dongxiao Xu
@ 2011-08-18 9:09 ` Dongxiao Xu
2011-08-23 6:27 ` [PATCH 0/5][PULL] multilib: Some fixes of improper ${PN} Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Dongxiao Xu @ 2011-08-18 9:09 UTC (permalink / raw)
To: openembedded-core
Remove the install.patch which hardcode the lib paths.
Change ${PN} to ${BPN} in file names.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../procps/procps-3.2.8/install.patch | 29 --------------------
meta/recipes-extended/procps/procps.inc | 3 +-
meta/recipes-extended/procps/procps_3.2.8.bb | 8 +++---
3 files changed, 5 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/install.patch
diff --git a/meta/recipes-extended/procps/procps-3.2.8/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch
deleted file mode 100644
index b52a2c9..0000000
--- a/meta/recipes-extended/procps/procps-3.2.8/install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- procps-3.2.5.virgin/Makefile 2005-01-26 05:55:26.000000000 +0100
-+++ procps-3.2.5/Makefile 2005-08-03 04:55:26.346984488 +0200
-@@ -30,7 +30,10 @@
- install := install -D --owner 0 --group 0
-
- # Lame x86-64 /lib64 and /usr/lib64 abomination:
--lib64 := lib$(shell [ -d /lib64 ] && echo 64)
-+# lib64 := lib$(shell [ -d /lib64 ] && echo 64)
-+
-+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not.
-+lib64 := lib
-
- usr/bin := $(DESTDIR)/usr/bin/
- bin := $(DESTDIR)/bin/
-@@ -211,10 +214,10 @@
- ###### install
-
- $(BINFILES) : all
-- $(install) --mode a=rx $(notdir $@) $@
-+ $(install) -m 555 $(notdir $@) $@
-
- $(MANFILES) : all
-- $(install) --mode a=r $(notdir $@) $@
-+ $(install) -m 444 $(notdir $@) $@
-
- install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
- cd $(usr/bin) && $(ln_f) skill snice
diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc
index ada3257..c3081c3 100644
--- a/meta/recipes-extended/procps/procps.inc
+++ b/meta/recipes-extended/procps/procps.inc
@@ -12,7 +12,6 @@ DEPENDS = "ncurses"
FILES_${PN} += "${base_libdir}/libproc-*.so"
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
- file://install.patch"
+SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz"
inherit autotools
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index b1a7de7..a38077e 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -1,6 +1,6 @@
require procps.inc
-PR = "r1"
+PR = "r2"
inherit update-rc.d update-alternatives
@@ -22,10 +22,10 @@ SRC_URI += "file://procmodule.patch \
SRC_URI[md5sum] = "9532714b6846013ca9898984ba4cd7e0"
SRC_URI[sha256sum] = "11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535"
-FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
- ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
+FILES = "${bindir}/top.${BPN} ${base_bindir}/ps.${BPN} ${bindir}/uptime.${BPN} ${base_bindir}/kill.${BPN} \
+ ${bindir}/free.${BPN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
- ${base_sbindir}/sysctl.${PN}"
+ ${base_sbindir}/sysctl.${BPN}"
CONFFILES_${PN} = "${sysconfdir}/sysctl.conf"
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/5][PULL] multilib: Some fixes of improper ${PN}
2011-08-18 9:08 [PATCH 0/5][PULL] multilib: Some fixes of improper ${PN} Dongxiao Xu
` (4 preceding siblings ...)
2011-08-18 9:09 ` [PATCH 5/5] procps: Fix lib path to support multilib Dongxiao Xu
@ 2011-08-23 6:27 ` Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2011-08-23 6:27 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/18/2011 02:08 AM, Dongxiao Xu wrote:
> Hi Richard,
>
> This pull request fixes some improper ${PN}, please help to reivew and pull.
>
> Thanks,
> Dongxiao
>
> The following changes since commit 2e83e6755441cb14bd907d306974338c15173189:
>
> kernel: restore crtsavres.o to enable building external modules on powerpc (2011-08-17 15:46:16 +0100)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib dxu4/ml
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml
>
> Dongxiao Xu (5):
> curl: Use BPN instead of PN for style like lib${PN}
> ea-acl: Use BPN instead of PN for style like lib${PN}
> attr: Use BPN instead of PN for style like lib${PN}
> acl: Use BPN instead of PN for style like lib${PN}
The above 4 have been merged to OE-Core
> procps: Fix lib path to support multilib
There are some comments from Richard on the patch in the Consolidated
Pull Request from last week, please review and resubmit.
Thanks
Sau!
>
> .../procps/procps-3.2.8/install.patch | 29 --------------------
> meta/recipes-extended/procps/procps.inc | 3 +-
> meta/recipes-extended/procps/procps_3.2.8.bb | 8 +++---
> meta/recipes-support/attr/acl.inc | 2 +-
> meta/recipes-support/attr/attr.inc | 2 +-
> meta/recipes-support/attr/ea-acl.inc | 6 ++--
> meta/recipes-support/curl/curl_7.21.7.bb | 8 +++---
> 7 files changed, 14 insertions(+), 44 deletions(-)
> delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/install.patch
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 7+ messages in thread