From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com ([134.134.136.20]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1UdF0W-0004ZH-He for openembedded-core@lists.openembedded.org; Fri, 17 May 2013 09:23:22 +0200 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 17 May 2013 00:05:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,690,1363158000"; d="scan'208";a="338776965" Received: from unknown (HELO [10.255.12.57]) ([10.255.12.57]) by orsmga002.jf.intel.com with ESMTP; 17 May 2013 00:04:53 -0700 Message-ID: <5195D693.9090003@linux.intel.com> Date: Fri, 17 May 2013 10:04:51 +0300 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: zhangxiao References: <1368689187-4714-1-git-send-email-xiao.zhang@windriver.com> <1368689187-4714-2-git-send-email-xiao.zhang@windriver.com> <5194AE0D.8030508@windriver.com> In-Reply-To: <5194AE0D.8030508@windriver.com> Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH] util-linux: replace package files X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 May 2013 07:23:33 -0000 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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 >> --- >> .../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 >> + >> +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