* [PATCH] util-linux: replace package files @ 2013-05-16 7:26 Zhang Xiao 2013-05-16 7:26 ` Zhang Xiao 0 siblings, 1 reply; 13+ messages in thread From: Zhang Xiao @ 2013-05-16 7:26 UTC (permalink / raw) To: openembedded-core, xiao.zhang Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM package to related library's dev RPM packages. [YOCTO #4500] [CQID: WIND00412705] Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> --- .../util-linux-replace-package-files.patch | 56 ++++++++++++++++++++ meta/recipes-core/util-linux/util-linux_2.22.2.bb | 1 + 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch new file mode 100644 index 0000000..32868cc --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch @@ -0,0 +1,56 @@ +Upstream-Status: Pending +Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> + +Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM +package to related library's dev RPM packages. +--- + libblkid/src/Makemodule.am | 6 +----- + libmount/src/Makemodule.am | 6 +----- + libuuid/src/Makemodule.am | 6 +----- + 3 files changed, 3 insertions(+), 15 deletions(-) + +--- util-linux-2.22.2/libuuid/src/Makemodule.am.orig ++++ util-linux-2.22.2/libuuid/src/Makemodule.am +@@ -42,11 +42,7 @@ install-exec-hook-libuuid: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \ +- so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ +- (cd $(DESTDIR)$(usrlib_execdir) && \ +- rm -f libuuid.so && \ +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \ ++ mv $(DESTDIR)$(usrlib_execdir)/libuuid.so $(DESTDIR)$(libdir); \ + fi + + uninstall-hook-libuuid: +--- util-linux-2.22.2/libmount/src/Makemodule.am.orig ++++ util-linux-2.22.2/libmount/src/Makemodule.am +@@ -123,11 +123,7 @@ install-exec-hook-libmount: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* $(DESTDIR)$(libdir); \ +- so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libmount.so); \ +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ +- (cd $(DESTDIR)$(usrlib_execdir) && \ +- rm -f libmount.so && \ +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libmount.so); \ ++ mv $(DESTDIR)$(usrlib_execdir)/libmount.so $(DESTDIR)$(libdir); \ + fi + + uninstall-hook-libmount: +--- util-linux-2.22.2/libblkid/src/Makemodule.am.orig ++++ util-linux-2.22.2/libblkid/src/Makemodule.am +@@ -219,11 +219,7 @@ install-exec-hook-libblkid: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \ +- so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ +- (cd $(DESTDIR)$(usrlib_execdir) && \ +- rm -f libblkid.so && \ +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \ ++ mv $(DESTDIR)$(usrlib_execdir)/libblkid.so $(DESTDIR)$(libdir); \ + fi + + uninstall-hook-libblkid: diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb index 43a55a6..526308d 100644 --- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb @@ -8,6 +8,7 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ file://configure-sbindir.patch \ file://fix-configure.patch \ file://mbsalign-license.patch \ + file://util-linux-replace-package-files.patch \ " SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e" -- 1.7.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH] util-linux: replace package files 2013-05-16 7:26 [PATCH] util-linux: replace package files Zhang Xiao @ 2013-05-16 7:26 ` Zhang Xiao 2013-05-16 9:59 ` zhangxiao 0 siblings, 1 reply; 13+ messages in thread From: Zhang Xiao @ 2013-05-16 7:26 UTC (permalink / raw) To: openembedded-core, xiao.zhang Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM package to related library's dev RPM packages. [YOCTO #4500] [CQID: WIND00412705] Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> --- .../util-linux-replace-package-files.patch | 56 ++++++++++++++++++++ meta/recipes-core/util-linux/util-linux_2.22.2.bb | 1 + 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch new file mode 100644 index 0000000..32868cc --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch @@ -0,0 +1,56 @@ +Upstream-Status: Pending +Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> + +Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM +package to related library's dev RPM packages. +--- + libblkid/src/Makemodule.am | 6 +----- + libmount/src/Makemodule.am | 6 +----- + libuuid/src/Makemodule.am | 6 +----- + 3 files changed, 3 insertions(+), 15 deletions(-) + +--- util-linux-2.22.2/libuuid/src/Makemodule.am.orig ++++ util-linux-2.22.2/libuuid/src/Makemodule.am +@@ -42,11 +42,7 @@ install-exec-hook-libuuid: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \ +- so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ +- (cd $(DESTDIR)$(usrlib_execdir) && \ +- rm -f libuuid.so && \ +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \ ++ mv $(DESTDIR)$(usrlib_execdir)/libuuid.so $(DESTDIR)$(libdir); \ + fi + + uninstall-hook-libuuid: +--- util-linux-2.22.2/libmount/src/Makemodule.am.orig ++++ util-linux-2.22.2/libmount/src/Makemodule.am +@@ -123,11 +123,7 @@ install-exec-hook-libmount: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* $(DESTDIR)$(libdir); \ +- so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libmount.so); \ +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ +- (cd $(DESTDIR)$(usrlib_execdir) && \ +- rm -f libmount.so && \ +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libmount.so); \ ++ mv $(DESTDIR)$(usrlib_execdir)/libmount.so $(DESTDIR)$(libdir); \ + fi + + uninstall-hook-libmount: +--- util-linux-2.22.2/libblkid/src/Makemodule.am.orig ++++ util-linux-2.22.2/libblkid/src/Makemodule.am +@@ -219,11 +219,7 @@ install-exec-hook-libblkid: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \ +- so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ +- (cd $(DESTDIR)$(usrlib_execdir) && \ +- rm -f libblkid.so && \ +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \ ++ mv $(DESTDIR)$(usrlib_execdir)/libblkid.so $(DESTDIR)$(libdir); \ + fi + + uninstall-hook-libblkid: diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb index 43a55a6..526308d 100644 --- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb @@ -8,6 +8,7 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ file://configure-sbindir.patch \ file://fix-configure.patch \ file://mbsalign-license.patch \ + file://util-linux-replace-package-files.patch \ " SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e" -- 1.7.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] util-linux: replace package files 2013-05-16 7:26 ` Zhang Xiao @ 2013-05-16 9:59 ` zhangxiao 2013-05-17 7:04 ` Saul Wold 0 siblings, 1 reply; 13+ messages in thread From: zhangxiao @ 2013-05-16 9:59 UTC (permalink / raw) To: openembedded-core And, another method lies on meta/recipes-core/util-linux/util-linux.inc: --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -69,11 +69,11 @@ FILES_util-linux-uuidd = "${sbindir}/uuidd" FILES_util-linux-reset = "${base_bindir}/reset" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" -FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" +FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" -FILES_util-linux-libmount-dev = "${base_libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" +FILES_util-linux-libmount-dev = "${libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc" FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" -FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" +FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" FILES_util-linux-lscpu = "${bindir}/lscpu" FILES_util-linux-fsck = "${base_sbindir}/fsck*" Which one is better? Thanks Xiao On 2013年05月16日 15:26, Zhang Xiao wrote: > Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM > package to related library's dev RPM packages. > > [YOCTO #4500] > [CQID: WIND00412705] > > Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> > --- > .../util-linux-replace-package-files.patch | 56 ++++++++++++++++++++ > meta/recipes-core/util-linux/util-linux_2.22.2.bb | 1 + > 2 files changed, 57 insertions(+), 0 deletions(-) > create mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch > > diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch > new file mode 100644 > index 0000000..32868cc > --- /dev/null > +++ b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch > @@ -0,0 +1,56 @@ > +Upstream-Status: Pending > +Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> > + > +Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM > +package to related library's dev RPM packages. > +--- > + libblkid/src/Makemodule.am | 6 +----- > + libmount/src/Makemodule.am | 6 +----- > + libuuid/src/Makemodule.am | 6 +----- > + 3 files changed, 3 insertions(+), 15 deletions(-) > + > +--- util-linux-2.22.2/libuuid/src/Makemodule.am.orig > ++++ util-linux-2.22.2/libuuid/src/Makemodule.am > +@@ -42,11 +42,7 @@ install-exec-hook-libuuid: > + if test "$(usrlib_execdir)" != "$(libdir)"; then \ > + mkdir -p $(DESTDIR)$(libdir); \ > + mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \ > +- so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ > +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ > +- (cd $(DESTDIR)$(usrlib_execdir) && \ > +- rm -f libuuid.so && \ > +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \ > ++ mv $(DESTDIR)$(usrlib_execdir)/libuuid.so $(DESTDIR)$(libdir); \ > + fi > + > + uninstall-hook-libuuid: > +--- util-linux-2.22.2/libmount/src/Makemodule.am.orig > ++++ util-linux-2.22.2/libmount/src/Makemodule.am > +@@ -123,11 +123,7 @@ install-exec-hook-libmount: > + if test "$(usrlib_execdir)" != "$(libdir)"; then \ > + mkdir -p $(DESTDIR)$(libdir); \ > + mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* $(DESTDIR)$(libdir); \ > +- so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libmount.so); \ > +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ > +- (cd $(DESTDIR)$(usrlib_execdir) && \ > +- rm -f libmount.so && \ > +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libmount.so); \ > ++ mv $(DESTDIR)$(usrlib_execdir)/libmount.so $(DESTDIR)$(libdir); \ > + fi > + > + uninstall-hook-libmount: > +--- util-linux-2.22.2/libblkid/src/Makemodule.am.orig > ++++ util-linux-2.22.2/libblkid/src/Makemodule.am > +@@ -219,11 +219,7 @@ install-exec-hook-libblkid: > + if test "$(usrlib_execdir)" != "$(libdir)"; then \ > + mkdir -p $(DESTDIR)$(libdir); \ > + mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \ > +- so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ > +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ > +- (cd $(DESTDIR)$(usrlib_execdir) && \ > +- rm -f libblkid.so && \ > +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \ > ++ mv $(DESTDIR)$(usrlib_execdir)/libblkid.so $(DESTDIR)$(libdir); \ > + fi > + > + uninstall-hook-libblkid: > diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb > index 43a55a6..526308d 100644 > --- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb > +++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb > @@ -8,6 +8,7 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ > file://configure-sbindir.patch \ > file://fix-configure.patch \ > file://mbsalign-license.patch \ > + file://util-linux-replace-package-files.patch \ > " > > SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e" > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] util-linux: replace package files 2013-05-16 9:59 ` zhangxiao @ 2013-05-17 7:04 ` Saul Wold 2013-05-17 9:43 ` package_write_ipk somehow looks into the wrong path Mike Looijmans 2013-05-21 1:44 ` [PATCH] util-linux: replace package files zhangxiao 0 siblings, 2 replies; 13+ messages in thread From: Saul Wold @ 2013-05-17 7:04 UTC (permalink / raw) To: zhangxiao; +Cc: openembedded-core On 05/16/2013 12:59 PM, zhangxiao wrote: > And, another method lies on meta/recipes-core/util-linux/util-linux.inc: > --- a/meta/recipes-core/util-linux/util-linux.inc > +++ b/meta/recipes-core/util-linux/util-linux.inc > @@ -69,11 +69,11 @@ FILES_util-linux-uuidd = "${sbindir}/uuidd" > FILES_util-linux-reset = "${base_bindir}/reset" > > FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" > -FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so > ${base_libdir}/libblkid.la ${includedir}/blkid > ${libdir}/pkgconfig/blkid.pc" > +FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so > ${base_libdir}/libblkid.la ${includedir}/blkid > ${libdir}/pkgconfig/blkid.pc" > FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" > -FILES_util-linux-libmount-dev = "${base_libdir}/libmount.so > ${base_libdir}/libmount.la ${includedir}/libmount > ${libdir}/pkgconfig/mount.pc" > +FILES_util-linux-libmount-dev = "${libdir}/libmount.so > ${base_libdir}/libmount.la ${includedir}/libmount > ${libdir}/pkgconfig/mount.pc" > FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" > -FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so > ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" > +FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so > ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" > FILES_util-linux-lscpu = "${bindir}/lscpu" > > FILES_util-linux-fsck = "${base_sbindir}/fsck*" > > Which one is better? > Xiao, Not sure what level of testing you did, the patch as it stands does need to be fixed, and as you note above which location for the .so library should be ${libdir}. With you original patch the pkgconfig file points to /usr/lib, while you have installed the library in /lib, this caused some failures in the world build. > Thanks > Xiao > > On 2013年05月16日 15:26, Zhang Xiao wrote: >> Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM >> package to related library's dev RPM packages. >> >> [YOCTO #4500] >> [CQID: WIND00412705] >> >> Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> >> --- >> .../util-linux-replace-package-files.patch | 56 >> ++++++++++++++++++++ >> meta/recipes-core/util-linux/util-linux_2.22.2.bb | 1 + >> 2 files changed, 57 insertions(+), 0 deletions(-) >> create mode 100644 >> meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch >> >> >> diff --git >> a/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch >> b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch >> >> new file mode 100644 >> index 0000000..32868cc >> --- /dev/null >> +++ >> b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch >> >> @@ -0,0 +1,56 @@ >> +Upstream-Status: Pending >> +Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> >> + >> +Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM >> +package to related library's dev RPM packages. >> +--- >> + libblkid/src/Makemodule.am | 6 +----- >> + libmount/src/Makemodule.am | 6 +----- >> + libuuid/src/Makemodule.am | 6 +----- >> + 3 files changed, 3 insertions(+), 15 deletions(-) >> + >> +--- util-linux-2.22.2/libuuid/src/Makemodule.am.orig >> ++++ util-linux-2.22.2/libuuid/src/Makemodule.am >> +@@ -42,11 +42,7 @@ install-exec-hook-libuuid: >> + if test "$(usrlib_execdir)" != "$(libdir)"; then \ >> + mkdir -p $(DESTDIR)$(libdir); \ >> + mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* >> $(DESTDIR)$(libdir); \ >> +- so_img_name=$$(readlink >> $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ >> +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed >> 's,\(^/\|\)[^/][^/]*,..,g'); \ >> +- (cd $(DESTDIR)$(usrlib_execdir) && \ >> +- rm -f libuuid.so && \ >> +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name >> libuuid.so); \ >> ++ mv $(DESTDIR)$(usrlib_execdir)/libuuid.so >> $(DESTDIR)$(libdir); \ >> + fi >> + >> + uninstall-hook-libuuid: >> +--- util-linux-2.22.2/libmount/src/Makemodule.am.orig >> ++++ util-linux-2.22.2/libmount/src/Makemodule.am >> +@@ -123,11 +123,7 @@ install-exec-hook-libmount: >> + if test "$(usrlib_execdir)" != "$(libdir)"; then \ >> + mkdir -p $(DESTDIR)$(libdir); \ >> + mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* >> $(DESTDIR)$(libdir); \ >> +- so_img_name=$$(readlink >> $(DESTDIR)$(usrlib_execdir)/libmount.so); \ >> +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed >> 's,\(^/\|\)[^/][^/]*,..,g'); \ >> +- (cd $(DESTDIR)$(usrlib_execdir) && \ >> +- rm -f libmount.so && \ >> +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name >> libmount.so); \ >> ++ mv $(DESTDIR)$(usrlib_execdir)/libmount.so >> $(DESTDIR)$(libdir); \ >> + fi >> + >> + uninstall-hook-libmount: >> +--- util-linux-2.22.2/libblkid/src/Makemodule.am.orig >> ++++ util-linux-2.22.2/libblkid/src/Makemodule.am >> +@@ -219,11 +219,7 @@ install-exec-hook-libblkid: >> + if test "$(usrlib_execdir)" != "$(libdir)"; then \ >> + mkdir -p $(DESTDIR)$(libdir); \ >> + mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* >> $(DESTDIR)$(libdir); \ >> +- so_img_name=$$(readlink >> $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ >> +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed >> 's,\(^/\|\)[^/][^/]*,..,g'); \ >> +- (cd $(DESTDIR)$(usrlib_execdir) && \ >> +- rm -f libblkid.so && \ >> +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name >> libblkid.so); \ >> ++ mv $(DESTDIR)$(usrlib_execdir)/libblkid.so >> $(DESTDIR)$(libdir); \ >> + fi >> + >> + uninstall-hook-libblkid: >> diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb >> b/meta/recipes-core/util-linux/util-linux_2.22.2.bb >> index 43a55a6..526308d 100644 >> --- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb >> +++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb >> @@ -8,6 +8,7 @@ SRC_URI += >> "file://util-linux-ng-replace-siginterrupt.patch \ >> file://configure-sbindir.patch \ >> file://fix-configure.patch \ >> file://mbsalign-license.patch \ >> + file://util-linux-replace-package-files.patch \ >> " >> >> SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e" >> > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 13+ messages in thread
* package_write_ipk somehow looks into the wrong path 2013-05-17 7:04 ` Saul Wold @ 2013-05-17 9:43 ` Mike Looijmans 2013-05-17 10:15 ` Martin Jansa 2013-05-21 1:44 ` [PATCH] util-linux: replace package files zhangxiao 1 sibling, 1 reply; 13+ messages in thread From: Mike Looijmans @ 2013-05-17 9:43 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 4459 bytes --] I got this very weird build failure. It builds fine for one machine (zedboard), but it craps out in a really weird way on the "zynq-zc702" machine. Somehow the "package_write_ipk" task wants to find files in a directory with "1-r0" (a version that has once existed a long long time ago) in the version part, instead of the proper git hashed name. I've tried a "cleansstate" but that did not help. The "compile" step in this recipe takes about 1,5 hour on my i7 system, so debugging this recipe is painfully slow... I've attached the recipes, pasted the log below. mike@paradigit:~/zynq/build$ nice -n 15 bitbake my-image Loading cache: 100% |###########################################| ETA: 00:00:00 Loaded 1907 entries from dependency cache. Parsing recipes: 100% |#########################################| Time: 00:00:00 Parsing of 1517 .bb files complete (1514 cached, 3 parsed). 1909 targets, 115 skipped, 0 masked, 0 errors. Build Configuration: BB_VERSION = "1.17.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "Ubuntu-11.10" TARGET_SYS = "arm-oe-linux-gnueabi" MACHINE = "zynq-zc702" DISTRO = "tiny" DISTRO_VERSION = "oe-core.0" TUNE_FEATURES = "armv7a vfp neon" TARGET_FPU = "vfp-neon" meta = "master:a3c1e0f4e519921a692a5f4d1268a4eb249b1b03" meta-oe toolchain-layer meta-efl meta-gpe meta-gnome meta-xfce meta-multimedia = "master:3dcea929763e6a3233dbe620920f02682b28bb8d" meta-zynq = "master:7458ae3d3007c8159152a930a7f40991c1725240" meta-topic = "master:860265ec025e9c7f05acd0778591cc9390a39e6c" NOTE: Resolving any missing task queue dependencies NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks ERROR: Error executing a python function in /home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb: OSError: [Errno 2] No such file or directory: '/home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/1-r0/packages-split/fpga-image' ERROR: The stack trace of python calls that resulted in this exception/failure was: ERROR: File "do_package_ipk", line 194, in <module> ERROR: ERROR: File "do_package_ipk", line 45, in do_package_ipk ERROR: ERROR: The code that was being executed was: ERROR: 0190: bb.utils.unlockfile(lf) ERROR: 0191: ERROR: 0192: ERROR: 0193: ERROR: *** 0194:do_package_ipk(d) ERROR: 0195: ERROR: [From file: 'do_package_ipk', lineno: 194, function: <module>] ERROR: 0041: basedir = os.path.join(os.path.dirname(root)) ERROR: 0042: arch = localdata.getVar('PACKAGE_ARCH', True) ERROR: 0043: pkgoutdir = "%s/%s" % (outdir, arch) ERROR: 0044: bb.mkdirhier(pkgoutdir) ERROR: *** 0045: os.chdir(root) ERROR: 0046: from glob import glob ERROR: 0047: g = glob('*') ERROR: 0048: try: ERROR: 0049: del g[g.index('CONTROL')] ERROR: [From file: 'do_package_ipk', lineno: 45, function: do_package_ipk] ERROR: Function failed: do_package_ipk ERROR: Execution of event handler 'run_buildstats' failed Traceback (most recent call last): File "run_buildstats(e)", line 103, in run_buildstats(e=<bb.build.TaskFailed object at 0x1575ca90>) File "buildstats.bbclass", line 5, in write_task_data(status='failed', logfile='/home/mike/zynq/build/tmp-eglibc/buildstats/my-image-zynq-zc702/201305171106/fpga-image-1-r0/do_package_write_ipk', dev='sda5', e=<bb.build.TaskFailed object at 0x1575ca90>) IOError: [Errno 2] No such file or directory: '/home/mike/zynq/build/tmp-eglibc/buildstats/my-image-zynq-zc702/201305171106/fpga-image-1-r0/do_package_write_ipk' ERROR: Logfile of failure stored in: /home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/2.AUTOINC-8095d780aab8d110298d655852f8f31053f5f124-r0/temp/log.do_package_write_ipk.5262 ERROR: Task 335 (/home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, do_package_write_ipk) failed with exit code '1' NOTE: Tasks Summary: Attempted 1836 tasks of which 1799 didn't need to be rerun and 1 failed. No currently running tasks (1836 of 1840) Summary: 1 task failed: /home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, do_package_write_ipk Summary: There were 26 ERROR messages shown, returning a non-zero exit code. [-- Attachment #2: fpga-design.inc --] [-- Type: text/plain, Size: 965 bytes --] LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" # Package is machine specific PACKAGE_ARCH = "${MACHINE}" # Workaround: XPS fails to build when there's a "+" in the path. SRCPV_NOPLUS = "${@d.getVar('SRCPV',True).replace('+','-')}" S="${WORKDIR}/git" BOARD_DESIGN_URI ?= "" BOARD_DESIGN_URI_zedboard = "git://github.com/milosoftware/zynq-zedboard-logic.git" SRCREV_board-zedboard = "63e317164357bf87bba7dd0adc429d4c91a78cff" BOARD_DESIGN_URI_zynq-zc702 = "git://github.com/milosoftware/zynq-zc702-logic.git" SRCREV_board-zynq-zc702 = "8095d780aab8d110298d655852f8f31053f5f124" SRC_URI = "\ ${BOARD_DESIGN_URI};name=board-${MACHINE} \ http://wiki.analog.com/_media/resources/fpga/xilinx/kc705/cf_adv7511_zed_edk_14_4_2013_02_05.tar.gz;name=vhdl \ " SRC_URI[vhdl.md5sum] = "7bfa99f576e0f4a40d6fc30c2e111470" SRC_URI[vhdl.sha256sum] = "4dea2dc0c32da8556c88e299350964816b67593d23eb590fb62393ce62229f09" [-- Attachment #3: fpga-image.bb --] [-- Type: text/plain, Size: 1272 bytes --] DESCRIPTION = "FPGA bit image loader from userspace and tools" DEPENDS = "python-native" require fpga-design.inc PV = "2.${SRCPV_NOPLUS}" PR = "r0" PACKAGES = "${PN}" S="${WORKDIR}/git" SRC_URI += "\ file://fpga-bit-to-bin.py \ file://init \ " inherit update-rc.d # Set to start at 03, which is before modutils # so you can autoload modules which use FPGA logic. INITSCRIPT_NAME = "${PN}.sh" INITSCRIPT_PARAMS = "start 03 S ." do_compile() { export LM_LICENSE_FILE="${XILINX_LM_LICENSE_FILE}" source ${XILINX_TOOL_PATH}/ISE_DS/settings${XILINX_TOOL_ARCH}.sh xps -nw system.xmp << EOF run bits run exporttosdk EOF python ${WORKDIR}/fpga-bit-to-bin.py --flip ${S}/implementation/system.bit ${WORKDIR}/fpga.bin } FILES_${PN} = "${sysconfdir} ${datadir}" do_install() { install -d ${D}${sysconfdir} install -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${PN}.sh install -d ${D}${datadir} install -m 644 ${WORKDIR}/fpga.bin ${D}${datadir}/fpga.bin } # Store the SDK files into the sysroot for other packages SYSROOT_PREPROCESS_FUNCS += "fpga_sysroot_preprocess" fpga_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${datadir}/xilinx_sdk cp -r ${S}/SDK/SDK_Export/hw/* ${SYSROOT_DESTDIR}${datadir}/xilinx_sdk/ } ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: package_write_ipk somehow looks into the wrong path 2013-05-17 9:43 ` package_write_ipk somehow looks into the wrong path Mike Looijmans @ 2013-05-17 10:15 ` Martin Jansa 2013-05-17 10:51 ` Mike Looijmans 2013-05-17 11:11 ` Mike Looijmans 0 siblings, 2 replies; 13+ messages in thread From: Martin Jansa @ 2013-05-17 10:15 UTC (permalink / raw) To: Mike Looijmans; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 7561 bytes --] On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: > > I got this very weird build failure. It builds fine for one machine > (zedboard), but it craps out in a really weird way on the "zynq-zc702" > machine. > > Somehow the "package_write_ipk" task wants to find files in a directory > with "1-r0" (a version that has once existed a long long time ago) in > the version part, instead of the proper git hashed name. > > I've tried a "cleansstate" but that did not help. The "compile" step in > this recipe takes about 1,5 hour on my i7 system, so debugging this > recipe is painfully slow... > > I've attached the recipes, pasted the log below. try it with 2/2 patch from https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 > > > > > mike@paradigit:~/zynq/build$ nice -n 15 bitbake my-image > Loading cache: 100% |###########################################| ETA: > 00:00:00 > Loaded 1907 entries from dependency cache. > Parsing recipes: 100% |#########################################| Time: > 00:00:00 > Parsing of 1517 .bb files complete (1514 cached, 3 parsed). 1909 > targets, 115 skipped, 0 masked, 0 errors. > > Build Configuration: > BB_VERSION = "1.17.1" > BUILD_SYS = "x86_64-linux" > NATIVELSBSTRING = "Ubuntu-11.10" > TARGET_SYS = "arm-oe-linux-gnueabi" > MACHINE = "zynq-zc702" > DISTRO = "tiny" > DISTRO_VERSION = "oe-core.0" > TUNE_FEATURES = "armv7a vfp neon" > TARGET_FPU = "vfp-neon" > meta = "master:a3c1e0f4e519921a692a5f4d1268a4eb249b1b03" > meta-oe > toolchain-layer > meta-efl > meta-gpe > meta-gnome > meta-xfce > meta-multimedia = "master:3dcea929763e6a3233dbe620920f02682b28bb8d" > meta-zynq = "master:7458ae3d3007c8159152a930a7f40991c1725240" > meta-topic = "master:860265ec025e9c7f05acd0778591cc9390a39e6c" > > NOTE: Resolving any missing task queue dependencies > NOTE: Preparing runqueue > NOTE: Executing SetScene Tasks > NOTE: Executing RunQueue Tasks > ERROR: Error executing a python function in > /home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb: > OSError: [Errno 2] No such file or directory: > '/home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/1-r0/packages-split/fpga-image' > > ERROR: The stack trace of python calls that resulted in this > exception/failure was: > ERROR: File "do_package_ipk", line 194, in <module> > ERROR: > ERROR: File "do_package_ipk", line 45, in do_package_ipk > ERROR: > ERROR: The code that was being executed was: > ERROR: 0190: bb.utils.unlockfile(lf) > ERROR: 0191: > ERROR: 0192: > ERROR: 0193: > ERROR: *** 0194:do_package_ipk(d) > ERROR: 0195: > ERROR: [From file: 'do_package_ipk', lineno: 194, function: <module>] > ERROR: 0041: basedir = os.path.join(os.path.dirname(root)) > ERROR: 0042: arch = localdata.getVar('PACKAGE_ARCH', True) > ERROR: 0043: pkgoutdir = "%s/%s" % (outdir, arch) > ERROR: 0044: bb.mkdirhier(pkgoutdir) > ERROR: *** 0045: os.chdir(root) > ERROR: 0046: from glob import glob > ERROR: 0047: g = glob('*') > ERROR: 0048: try: > ERROR: 0049: del g[g.index('CONTROL')] > ERROR: [From file: 'do_package_ipk', lineno: 45, function: do_package_ipk] > ERROR: Function failed: do_package_ipk > ERROR: Execution of event handler 'run_buildstats' failed > Traceback (most recent call last): > File "run_buildstats(e)", line 103, in > run_buildstats(e=<bb.build.TaskFailed object at 0x1575ca90>) > File "buildstats.bbclass", line 5, in > write_task_data(status='failed', > logfile='/home/mike/zynq/build/tmp-eglibc/buildstats/my-image-zynq-zc702/201305171106/fpga-image-1-r0/do_package_write_ipk', > dev='sda5', e=<bb.build.TaskFailed object at 0x1575ca90>) > IOError: [Errno 2] No such file or directory: > '/home/mike/zynq/build/tmp-eglibc/buildstats/my-image-zynq-zc702/201305171106/fpga-image-1-r0/do_package_write_ipk' > > ERROR: Logfile of failure stored in: > /home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/2.AUTOINC-8095d780aab8d110298d655852f8f31053f5f124-r0/temp/log.do_package_write_ipk.5262 > ERROR: Task 335 > (/home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, > do_package_write_ipk) failed with exit code '1' > NOTE: Tasks Summary: Attempted 1836 tasks of which 1799 didn't need to > be rerun and 1 failed. > No currently running tasks (1836 of 1840) > > Summary: 1 task failed: > /home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, > do_package_write_ipk > Summary: There were 26 ERROR messages shown, returning a non-zero exit code. > > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" > # Package is machine specific > PACKAGE_ARCH = "${MACHINE}" > > # Workaround: XPS fails to build when there's a "+" in the path. > SRCPV_NOPLUS = "${@d.getVar('SRCPV',True).replace('+','-')}" > > S="${WORKDIR}/git" > > BOARD_DESIGN_URI ?= "" > > BOARD_DESIGN_URI_zedboard = "git://github.com/milosoftware/zynq-zedboard-logic.git" > SRCREV_board-zedboard = "63e317164357bf87bba7dd0adc429d4c91a78cff" > > BOARD_DESIGN_URI_zynq-zc702 = "git://github.com/milosoftware/zynq-zc702-logic.git" > SRCREV_board-zynq-zc702 = "8095d780aab8d110298d655852f8f31053f5f124" > > SRC_URI = "\ > ${BOARD_DESIGN_URI};name=board-${MACHINE} \ > http://wiki.analog.com/_media/resources/fpga/xilinx/kc705/cf_adv7511_zed_edk_14_4_2013_02_05.tar.gz;name=vhdl \ > " > > SRC_URI[vhdl.md5sum] = "7bfa99f576e0f4a40d6fc30c2e111470" > SRC_URI[vhdl.sha256sum] = "4dea2dc0c32da8556c88e299350964816b67593d23eb590fb62393ce62229f09" > > DESCRIPTION = "FPGA bit image loader from userspace and tools" > DEPENDS = "python-native" > > require fpga-design.inc > > PV = "2.${SRCPV_NOPLUS}" > PR = "r0" > > PACKAGES = "${PN}" > > S="${WORKDIR}/git" > > SRC_URI += "\ > file://fpga-bit-to-bin.py \ > file://init \ > " > > inherit update-rc.d > > # Set to start at 03, which is before modutils > # so you can autoload modules which use FPGA logic. > INITSCRIPT_NAME = "${PN}.sh" > INITSCRIPT_PARAMS = "start 03 S ." > > do_compile() { > export LM_LICENSE_FILE="${XILINX_LM_LICENSE_FILE}" > source ${XILINX_TOOL_PATH}/ISE_DS/settings${XILINX_TOOL_ARCH}.sh > xps -nw system.xmp << EOF > run bits > run exporttosdk > EOF > python ${WORKDIR}/fpga-bit-to-bin.py --flip ${S}/implementation/system.bit ${WORKDIR}/fpga.bin > } > > FILES_${PN} = "${sysconfdir} ${datadir}" > do_install() { > install -d ${D}${sysconfdir} > install -d ${D}${sysconfdir}/init.d > install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/${PN}.sh > install -d ${D}${datadir} > install -m 644 ${WORKDIR}/fpga.bin ${D}${datadir}/fpga.bin > } > > # Store the SDK files into the sysroot for other packages > SYSROOT_PREPROCESS_FUNCS += "fpga_sysroot_preprocess" > fpga_sysroot_preprocess() { > install -d ${SYSROOT_DESTDIR}${datadir}/xilinx_sdk > cp -r ${S}/SDK/SDK_Export/hw/* ${SYSROOT_DESTDIR}${datadir}/xilinx_sdk/ > } > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: package_write_ipk somehow looks into the wrong path 2013-05-17 10:15 ` Martin Jansa @ 2013-05-17 10:51 ` Mike Looijmans 2013-05-17 11:04 ` Mike Looijmans 2013-05-17 13:23 ` Martin Jansa 2013-05-17 11:11 ` Mike Looijmans 1 sibling, 2 replies; 13+ messages in thread From: Mike Looijmans @ 2013-05-17 10:51 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core On 05/17/2013 12:15 PM, Martin Jansa wrote: > On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: >> >> I got this very weird build failure. It builds fine for one machine >> (zedboard), but it craps out in a really weird way on the "zynq-zc702" >> machine. >> >> Somehow the "package_write_ipk" task wants to find files in a directory >> with "1-r0" (a version that has once existed a long long time ago) in >> the version part, instead of the proper git hashed name. >> >> I've tried a "cleansstate" but that did not help. The "compile" step in >> this recipe takes about 1,5 hour on my i7 system, so debugging this >> recipe is painfully slow... >> >> I've attached the recipes, pasted the log below. > > try it with 2/2 patch from > https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 > I somehow fail to extract the patch from the mail correctly (probably lack of skilz on my side, I am not often at the receiving end of mailed patches). But my recipe does mess with the PV string because the Xilinx tools will fail to work properly when there is a "+" sign in the path. I'll try to fix it in a more proper way than using a python replace, see if that helps. Mike. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: package_write_ipk somehow looks into the wrong path 2013-05-17 10:51 ` Mike Looijmans @ 2013-05-17 11:04 ` Mike Looijmans 2013-05-17 13:23 ` Martin Jansa 1 sibling, 0 replies; 13+ messages in thread From: Mike Looijmans @ 2013-05-17 11:04 UTC (permalink / raw) To: openembedded-core On 05/17/2013 12:51 PM, Mike Looijmans wrote: > On 05/17/2013 12:15 PM, Martin Jansa wrote: >> On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: >>> >>> I got this very weird build failure. It builds fine for one machine >>> (zedboard), but it craps out in a really weird way on the "zynq-zc702" >>> machine. >>> >>> Somehow the "package_write_ipk" task wants to find files in a directory >>> with "1-r0" (a version that has once existed a long long time ago) in >>> the version part, instead of the proper git hashed name. >>> >>> I've tried a "cleansstate" but that did not help. The "compile" step in >>> this recipe takes about 1,5 hour on my i7 system, so debugging this >>> recipe is painfully slow... >>> >>> I've attached the recipes, pasted the log below. >> >> try it with 2/2 patch from >> https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 >> > > I somehow fail to extract the patch from the mail correctly (probably > lack of skilz on my side, I am not often at the receiving end of mailed > patches). > > But my recipe does mess with the PV string because the Xilinx tools will > fail to work properly when there is a "+" sign in the path. I'll try to > fix it in a more proper way than using a python replace, see if that helps. Replaced SRCPV_NOPLUS = "${@d.getVar('SRCPV',True).replace('+','-')}" with SRCPV = "${@bb.fetch2.get_srcrev(d).replace('+','-')}" did a cleansstate, but still the same error. Mike. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: package_write_ipk somehow looks into the wrong path 2013-05-17 10:51 ` Mike Looijmans 2013-05-17 11:04 ` Mike Looijmans @ 2013-05-17 13:23 ` Martin Jansa 1 sibling, 0 replies; 13+ messages in thread From: Martin Jansa @ 2013-05-17 13:23 UTC (permalink / raw) To: Mike Looijmans; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 1736 bytes --] On Fri, May 17, 2013 at 12:51:37PM +0200, Mike Looijmans wrote: > On 05/17/2013 12:15 PM, Martin Jansa wrote: > > On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: > >> > >> I got this very weird build failure. It builds fine for one machine > >> (zedboard), but it craps out in a really weird way on the "zynq-zc702" > >> machine. > >> > >> Somehow the "package_write_ipk" task wants to find files in a directory > >> with "1-r0" (a version that has once existed a long long time ago) in > >> the version part, instead of the proper git hashed name. > >> > >> I've tried a "cleansstate" but that did not help. The "compile" step in > >> this recipe takes about 1,5 hour on my i7 system, so debugging this > >> recipe is painfully slow... > >> > >> I've attached the recipes, pasted the log below. > > > > try it with 2/2 patch from > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 > > > > I somehow fail to extract the patch from the mail correctly (probably > lack of skilz on my side, I am not often at the receiving end of mailed > patches). Patchwork makes it a lot easier: http://patchwork.openembedded.org/patch/47329/ > But my recipe does mess with the PV string because the Xilinx tools will > fail to work properly when there is a "+" sign in the path. I'll try to > fix it in a more proper way than using a python replace, see if that helps. It could be caused by something else, just the error message looks the same when your recipe was built with different PV in different architecture before (that's what referenced patch detects and shows better error message then "No such file" later). -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: package_write_ipk somehow looks into the wrong path 2013-05-17 10:15 ` Martin Jansa 2013-05-17 10:51 ` Mike Looijmans @ 2013-05-17 11:11 ` Mike Looijmans 2013-05-17 11:13 ` Mike Looijmans 1 sibling, 1 reply; 13+ messages in thread From: Mike Looijmans @ 2013-05-17 11:11 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core On 05/17/2013 12:15 PM, Martin Jansa wrote: > On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: >> >> I got this very weird build failure. It builds fine for one machine >> (zedboard), but it craps out in a really weird way on the "zynq-zc702" >> machine. >> >> Somehow the "package_write_ipk" task wants to find files in a directory >> with "1-r0" (a version that has once existed a long long time ago) in >> the version part, instead of the proper git hashed name. >> >> I've tried a "cleansstate" but that did not help. The "compile" step in >> this recipe takes about 1,5 hour on my i7 system, so debugging this >> recipe is painfully slow... >> >> I've attached the recipes, pasted the log below. > > try it with 2/2 patch from > https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 Okay, I just manually applied those changes. Then I get: ERROR: Recipe fpga-image is trying to change PV from '2.AUTOINC-bfd37feb034919cc11b3879745f2770810a4e796' to '1'. This will cause do_package_write_ipk failing to find right workdir. That helps, but I still don't have the faintest idea what is going on here. What's wrong with my recipe? ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: package_write_ipk somehow looks into the wrong path 2013-05-17 11:11 ` Mike Looijmans @ 2013-05-17 11:13 ` Mike Looijmans 2013-05-17 11:39 ` Mike Looijmans 0 siblings, 1 reply; 13+ messages in thread From: Mike Looijmans @ 2013-05-17 11:13 UTC (permalink / raw) To: openembedded-core On 05/17/2013 01:11 PM, Mike Looijmans wrote: > On 05/17/2013 12:15 PM, Martin Jansa wrote: >> On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: >>> >>> I got this very weird build failure. It builds fine for one machine >>> (zedboard), but it craps out in a really weird way on the "zynq-zc702" >>> machine. >>> >>> Somehow the "package_write_ipk" task wants to find files in a directory >>> with "1-r0" (a version that has once existed a long long time ago) in >>> the version part, instead of the proper git hashed name. >>> >>> I've tried a "cleansstate" but that did not help. The "compile" step in >>> this recipe takes about 1,5 hour on my i7 system, so debugging this >>> recipe is painfully slow... >>> >>> I've attached the recipes, pasted the log below. >> >> try it with 2/2 patch from >> https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 > > Okay, I just manually applied those changes. Then I get: > > ERROR: Recipe fpga-image is trying to change PV from > '2.AUTOINC-bfd37feb034919cc11b3879745f2770810a4e796' to '1'. This will > cause do_package_write_ipk failing to find right workdir. > > > That helps, but I still don't have the faintest idea what is going on > here. What's wrong with my recipe? As a last resort, I tried just putting PV="3" into the recipe. WTF? ERROR: Recipe fpga-image is trying to change PV from '3' to '1'. This will cause do_package_write_ipk failing to find right workdir. ERROR: Function failed: read_subpackage_metadata ERROR: Logfile of failure stored in: /home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/3-r0/temp/log.do_package_write_ipk.13519 ERROR: Task 12 (/home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, do_package_write_ipk) failed with exit code '1' Who's touching my PV? Mike. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: package_write_ipk somehow looks into the wrong path 2013-05-17 11:13 ` Mike Looijmans @ 2013-05-17 11:39 ` Mike Looijmans 0 siblings, 0 replies; 13+ messages in thread From: Mike Looijmans @ 2013-05-17 11:39 UTC (permalink / raw) To: openembedded-core On 05/17/2013 01:13 PM, Mike Looijmans wrote: > On 05/17/2013 01:11 PM, Mike Looijmans wrote: >> On 05/17/2013 12:15 PM, Martin Jansa wrote: >>> On Fri, May 17, 2013 at 11:43:22AM +0200, Mike Looijmans wrote: >>>> >>>> I got this very weird build failure. It builds fine for one machine >>>> (zedboard), but it craps out in a really weird way on the "zynq-zc702" >>>> machine. >>>> >>>> Somehow the "package_write_ipk" task wants to find files in a directory >>>> with "1-r0" (a version that has once existed a long long time ago) in >>>> the version part, instead of the proper git hashed name. >>>> >>>> I've tried a "cleansstate" but that did not help. The "compile" step in >>>> this recipe takes about 1,5 hour on my i7 system, so debugging this >>>> recipe is painfully slow... >>>> >>>> I've attached the recipes, pasted the log below. >>> >>> try it with 2/2 patch from >>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=4102 >> >> Okay, I just manually applied those changes. Then I get: >> >> ERROR: Recipe fpga-image is trying to change PV from >> '2.AUTOINC-bfd37feb034919cc11b3879745f2770810a4e796' to '1'. This will >> cause do_package_write_ipk failing to find right workdir. >> >> >> That helps, but I still don't have the faintest idea what is going on >> here. What's wrong with my recipe? > > As a last resort, I tried just putting PV="3" into the recipe. WTF? > > > ERROR: Recipe fpga-image is trying to change PV from '3' to '1'. This > will cause do_package_write_ipk failing to find right workdir. > ERROR: Function failed: read_subpackage_metadata > ERROR: Logfile of failure stored in: > /home/mike/zynq/build/tmp-eglibc/work/zynq-zc702-oe-linux-gnueabi/fpga-image/3-r0/temp/log.do_package_write_ipk.13519 > > ERROR: Task 12 > (/home/mike/zynq/meta-zynq/recipes-bsp/fpga/fpga-image.bb, > do_package_write_ipk) failed with exit code '1' > > > Who's touching my PV? And found the problem at last. As a long time user of "classic" OE, I added: PACKAGE_ARCH = "${MACHINE}" this was causing the failure, replacing it with PACKAGE_ARCH = "${MACHINE_ARCH}" as other recipes appear to do fixed it. Mike. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] util-linux: replace package files 2013-05-17 7:04 ` Saul Wold 2013-05-17 9:43 ` package_write_ipk somehow looks into the wrong path Mike Looijmans @ 2013-05-21 1:44 ` zhangxiao 1 sibling, 0 replies; 13+ messages in thread From: zhangxiao @ 2013-05-21 1:44 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On 2013年05月17日 15:04, Saul Wold wrote: > On 05/16/2013 12:59 PM, zhangxiao wrote: >> And, another method lies on meta/recipes-core/util-linux/util-linux.inc: >> --- a/meta/recipes-core/util-linux/util-linux.inc >> +++ b/meta/recipes-core/util-linux/util-linux.inc >> @@ -69,11 +69,11 @@ FILES_util-linux-uuidd = "${sbindir}/uuidd" >> FILES_util-linux-reset = "${base_bindir}/reset" >> >> FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" >> -FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so >> ${base_libdir}/libblkid.la ${includedir}/blkid >> ${libdir}/pkgconfig/blkid.pc" >> +FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so >> ${base_libdir}/libblkid.la ${includedir}/blkid >> ${libdir}/pkgconfig/blkid.pc" >> FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" >> -FILES_util-linux-libmount-dev = "${base_libdir}/libmount.so >> ${base_libdir}/libmount.la ${includedir}/libmount >> ${libdir}/pkgconfig/mount.pc" >> +FILES_util-linux-libmount-dev = "${libdir}/libmount.so >> ${base_libdir}/libmount.la ${includedir}/libmount >> ${libdir}/pkgconfig/mount.pc" >> FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" >> -FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so >> ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" >> +FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so >> ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc" >> FILES_util-linux-lscpu = "${bindir}/lscpu" >> >> FILES_util-linux-fsck = "${base_sbindir}/fsck*" >> >> Which one is better? >> > Xiao, > > Not sure what level of testing you did, the patch as it stands does need > to be fixed, and as you note above which location for the .so library > should be ${libdir}. > > > With you original patch the pkgconfig file points to /usr/lib, while you > have installed the library in /lib, this caused some failures in the > world build. > > In fact, with both these two patches, I just `-c package_write` to make RPMs, Then check "image" directory and `rpm -qlp` checking files in them. And, need I resend a patch for this issue? Thanks Xiao >> Thanks >> Xiao >> >> On 2013年05月16日 15:26, Zhang Xiao wrote: >>> Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM >>> package to related library's dev RPM packages. >>> >>> [YOCTO #4500] >>> [CQID: WIND00412705] >>> >>> Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> >>> --- >>> .../util-linux-replace-package-files.patch | 56 >>> ++++++++++++++++++++ >>> meta/recipes-core/util-linux/util-linux_2.22.2.bb | 1 + >>> 2 files changed, 57 insertions(+), 0 deletions(-) >>> create mode 100644 >>> meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch >>> >>> >>> >>> diff --git >>> a/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch >>> >>> b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch >>> >>> >>> new file mode 100644 >>> index 0000000..32868cc >>> --- /dev/null >>> +++ >>> b/meta/recipes-core/util-linux/util-linux/util-linux-replace-package-files.patch >>> >>> >>> @@ -0,0 +1,56 @@ >>> +Upstream-Status: Pending >>> +Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> >>> + >>> +Move libuuid.so, libmount.so and libblkid.so from util-linux's dev RPM >>> +package to related library's dev RPM packages. >>> +--- >>> + libblkid/src/Makemodule.am | 6 +----- >>> + libmount/src/Makemodule.am | 6 +----- >>> + libuuid/src/Makemodule.am | 6 +----- >>> + 3 files changed, 3 insertions(+), 15 deletions(-) >>> + >>> +--- util-linux-2.22.2/libuuid/src/Makemodule.am.orig >>> ++++ util-linux-2.22.2/libuuid/src/Makemodule.am >>> +@@ -42,11 +42,7 @@ install-exec-hook-libuuid: >>> + if test "$(usrlib_execdir)" != "$(libdir)"; then \ >>> + mkdir -p $(DESTDIR)$(libdir); \ >>> + mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* >>> $(DESTDIR)$(libdir); \ >>> +- so_img_name=$$(readlink >>> $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ >>> +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed >>> 's,\(^/\|\)[^/][^/]*,..,g'); \ >>> +- (cd $(DESTDIR)$(usrlib_execdir) && \ >>> +- rm -f libuuid.so && \ >>> +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name >>> libuuid.so); \ >>> ++ mv $(DESTDIR)$(usrlib_execdir)/libuuid.so >>> $(DESTDIR)$(libdir); \ >>> + fi >>> + >>> + uninstall-hook-libuuid: >>> +--- util-linux-2.22.2/libmount/src/Makemodule.am.orig >>> ++++ util-linux-2.22.2/libmount/src/Makemodule.am >>> +@@ -123,11 +123,7 @@ install-exec-hook-libmount: >>> + if test "$(usrlib_execdir)" != "$(libdir)"; then \ >>> + mkdir -p $(DESTDIR)$(libdir); \ >>> + mv $(DESTDIR)$(usrlib_execdir)/libmount.so.* >>> $(DESTDIR)$(libdir); \ >>> +- so_img_name=$$(readlink >>> $(DESTDIR)$(usrlib_execdir)/libmount.so); \ >>> +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed >>> 's,\(^/\|\)[^/][^/]*,..,g'); \ >>> +- (cd $(DESTDIR)$(usrlib_execdir) && \ >>> +- rm -f libmount.so && \ >>> +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name >>> libmount.so); \ >>> ++ mv $(DESTDIR)$(usrlib_execdir)/libmount.so >>> $(DESTDIR)$(libdir); \ >>> + fi >>> + >>> + uninstall-hook-libmount: >>> +--- util-linux-2.22.2/libblkid/src/Makemodule.am.orig >>> ++++ util-linux-2.22.2/libblkid/src/Makemodule.am >>> +@@ -219,11 +219,7 @@ install-exec-hook-libblkid: >>> + if test "$(usrlib_execdir)" != "$(libdir)"; then \ >>> + mkdir -p $(DESTDIR)$(libdir); \ >>> + mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* >>> $(DESTDIR)$(libdir); \ >>> +- so_img_name=$$(readlink >>> $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ >>> +- so_img_rel_target=$$(echo $(usrlib_execdir) | sed >>> 's,\(^/\|\)[^/][^/]*,..,g'); \ >>> +- (cd $(DESTDIR)$(usrlib_execdir) && \ >>> +- rm -f libblkid.so && \ >>> +- $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name >>> libblkid.so); \ >>> ++ mv $(DESTDIR)$(usrlib_execdir)/libblkid.so >>> $(DESTDIR)$(libdir); \ >>> + fi >>> + >>> + uninstall-hook-libblkid: >>> diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb >>> b/meta/recipes-core/util-linux/util-linux_2.22.2.bb >>> index 43a55a6..526308d 100644 >>> --- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb >>> +++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb >>> @@ -8,6 +8,7 @@ SRC_URI += >>> "file://util-linux-ng-replace-siginterrupt.patch \ >>> file://configure-sbindir.patch \ >>> file://fix-configure.patch \ >>> file://mbsalign-license.patch \ >>> + file://util-linux-replace-package-files.patch \ >>> " >>> >>> SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e" >>> >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-05-21 1:44 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-16 7:26 [PATCH] util-linux: replace package files Zhang Xiao 2013-05-16 7:26 ` Zhang Xiao 2013-05-16 9:59 ` zhangxiao 2013-05-17 7:04 ` Saul Wold 2013-05-17 9:43 ` package_write_ipk somehow looks into the wrong path Mike Looijmans 2013-05-17 10:15 ` Martin Jansa 2013-05-17 10:51 ` Mike Looijmans 2013-05-17 11:04 ` Mike Looijmans 2013-05-17 13:23 ` Martin Jansa 2013-05-17 11:11 ` Mike Looijmans 2013-05-17 11:13 ` Mike Looijmans 2013-05-17 11:39 ` Mike Looijmans 2013-05-21 1:44 ` [PATCH] util-linux: replace package files zhangxiao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox