* Re: [oe-commits] Laurentiu Palcu : libdrm: upgrade to 2.4.44 [not found] <20130512163307.035FC504FC@opal> @ 2013-05-22 16:07 ` Martin Jansa 2013-05-23 8:26 ` Laurentiu Palcu 0 siblings, 1 reply; 5+ messages in thread From: Martin Jansa @ 2013-05-22 16:07 UTC (permalink / raw) To: Laurentiu Palcu; +Cc: openembedded-core, openembedded-commits [-- Attachment #1: Type: text/plain, Size: 5411 bytes --] On Sun, May 12, 2013 at 04:33:07PM +0000, git@git.openembedded.org wrote: > Module: openembedded-core.git > Branch: master > Commit: 563edb321594b007cae2294e807235ad22fd27da > URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=563edb321594b007cae2294e807235ad22fd27da > > Author: Laurentiu Palcu <laurentiu.palcu@intel.com> > Date: Fri May 10 16:23:33 2013 +0300 > > libdrm: upgrade to 2.4.44 > > Removed part of the installtests.patch since tests can now be installed > giving an option to configure script. > > Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> > Signed-off-by: Saul Wold <sgw@linux.intel.com> Are you using buildhistory to test such upgrades? This was caused by added --enable-install-test-programs. Buildhistory shows that kmstest and vbltest were added to PN causing PKG to change from libdrm2 to libdrm and breaking upgrade path ${PN}-tests looks like better place for tests. * check_data_file_clashes: Package libdrm wants to install file /usr/lib/libdrm.so.2 But that file is already provided by package * libdrm2 * check_data_file_clashes: Package libdrm wants to install file /usr/lib/libdrm.so.2.4.0 But that file is already provided by package * libdrm2 -PV = 2.4.42 -PR = r4.0 -PKGR = r4.0.2 -PKG = libdrm2 +PV = 2.4.44 +PR = r0 +PKGR = r0.0 RPROVIDES = -RDEPENDS = eglibc (>= 2.17) +RDEPENDS = eglibc (>= 2.17) libdrm-kms (>= 2.4.44) RRECOMMENDS = -PKGSIZE = 34635 +PKGSIZE = 46491 FILES = /usr/bin/* /usr/sbin/* /usr/lib/libdrm/* /usr/lib/lib*.so.* /etc /com /var /bin/* /sbin/* /lib/*.so.* /lib/udev/rules.d /usr/lib/udev/rules.d /usr/share/libdrm /usr/lib/libdrm/* /usr/share/pixmaps /usr/share/applications /usr/share/idl /usr/share/omf /usr/share/sounds /usr/lib/bonobo/servers -FILELIST = /usr/lib/libdrm.so.2 /usr/lib/libdrm.so.2.4.0 +FILELIST = /usr/bin/kmstest /usr/bin/vbltest /usr/lib/libdrm.so.2 /usr/lib/libdrm.so.2.4.0 > --- > > meta/recipes-graphics/drm/libdrm.inc | 1 + > .../recipes-graphics/drm/libdrm/installtests.patch | 26 -------------------- > meta/recipes-graphics/drm/libdrm_2.4.42.bb | 10 ------- > meta/recipes-graphics/drm/libdrm_2.4.44.bb | 8 ++++++ > 4 files changed, 9 insertions(+), 36 deletions(-) > > diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc > index 9c1124e..e395e03 100644 > --- a/meta/recipes-graphics/drm/libdrm.inc > +++ b/meta/recipes-graphics/drm/libdrm.inc > @@ -20,6 +20,7 @@ inherit autotools pkgconfig > > EXTRA_OECONF += "--disable-cairo-tests \ > --enable-omap-experimental-api \ > + --enable-install-test-programs \ > " > ALLOW_EMPTY_${PN}-drivers = "1" > PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ > diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch > index 1f39719..7d443af 100644 > --- a/meta/recipes-graphics/drm/libdrm/installtests.patch > +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch > @@ -21,29 +21,3 @@ index bf1987f..d909e19 100644 > SUBDIRS = modeprint > > if HAVE_LIBKMS > -diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am > -index c4862ac..7db76ea 100644 > ---- a/tests/modeprint/Makefile.am > -+++ b/tests/modeprint/Makefile.am > -@@ -2,7 +2,7 @@ AM_CFLAGS = \ > - -I$(top_srcdir)/include/drm \ > - -I$(top_srcdir) > - > --noinst_PROGRAMS = \ > -+bin_PROGRAMS = \ > - modeprint > - > - modeprint_SOURCES = \ > -diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am > -index 2191242..1d2c1b0 100644 > ---- a/tests/modetest/Makefile.am > -+++ b/tests/modetest/Makefile.am > -@@ -4,7 +4,7 @@ AM_CFLAGS = \ > - -I$(top_srcdir) \ > - $(CAIRO_CFLAGS) > - > --noinst_PROGRAMS = \ > -+bin_PROGRAMS = \ > - modetest > - > - modetest_SOURCES = \ > diff --git a/meta/recipes-graphics/drm/libdrm_2.4.42.bb b/meta/recipes-graphics/drm/libdrm_2.4.42.bb > deleted file mode 100644 > index 67ae2e6..0000000 > --- a/meta/recipes-graphics/drm/libdrm_2.4.42.bb > +++ /dev/null > @@ -1,10 +0,0 @@ > -require libdrm.inc > - > -PR = "${INC_PR}.0" > - > -SRC_URI += "file://installtests.patch \ > - file://GNU_SOURCE_definition.patch \ > - " > - > -SRC_URI[md5sum] = "a6e2e26951bcc920b2049b65e86a659f" > -SRC_URI[sha256sum] = "e0671082a77871c8474d3c0f09dbf5ff82d2429cd248088a691f7b484cbc76e1" > diff --git a/meta/recipes-graphics/drm/libdrm_2.4.44.bb b/meta/recipes-graphics/drm/libdrm_2.4.44.bb > new file mode 100644 > index 0000000..b016958 > --- /dev/null > +++ b/meta/recipes-graphics/drm/libdrm_2.4.44.bb > @@ -0,0 +1,8 @@ > +require libdrm.inc > + > +SRC_URI += "file://installtests.patch \ > + file://GNU_SOURCE_definition.patch \ > + " > +SRC_URI[md5sum] = "b760b1f2ae4ec6452383164ec697cd5d" > +SRC_URI[sha256sum] = "42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2" > + > > > _______________________________________________ > Openembedded-commits mailing list > Openembedded-commits@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe-commits] Laurentiu Palcu : libdrm: upgrade to 2.4.44 2013-05-22 16:07 ` [oe-commits] Laurentiu Palcu : libdrm: upgrade to 2.4.44 Martin Jansa @ 2013-05-23 8:26 ` Laurentiu Palcu 2013-05-23 8:55 ` [PATCH] libdrm: fix packaging after last upgrade Martin Jansa 0 siblings, 1 reply; 5+ messages in thread From: Laurentiu Palcu @ 2013-05-23 8:26 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core, openembedded-commits On 05/22/2013 07:07 PM, Martin Jansa wrote: > On Sun, May 12, 2013 at 04:33:07PM +0000, git@git.openembedded.org wrote: >> > Module: openembedded-core.git >> > Branch: master >> > Commit: 563edb321594b007cae2294e807235ad22fd27da >> > URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=563edb321594b007cae2294e807235ad22fd27da >> > >> > Author: Laurentiu Palcu <laurentiu.palcu@intel.com> >> > Date: Fri May 10 16:23:33 2013 +0300 >> > >> > libdrm: upgrade to 2.4.44 >> > >> > Removed part of the installtests.patch since tests can now be installed >> > giving an option to configure script. >> > >> > Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> >> > Signed-off-by: Saul Wold <sgw@linux.intel.com> > Are you using buildhistory to test such upgrades? > > This was caused by added --enable-install-test-programs. > > Buildhistory shows that kmstest and vbltest were added to PN causing PKG to > change from libdrm2 to libdrm and breaking upgrade path > > ${PN}-tests looks like better place for tests. > > * check_data_file_clashes: Package libdrm wants to install file /usr/lib/libdrm.so.2 > But that file is already provided by package * libdrm2 > * check_data_file_clashes: Package libdrm wants to install file /usr/lib/libdrm.so.2.4.0 > But that file is already provided by package * libdrm2 > > -PV = 2.4.42 > -PR = r4.0 > -PKGR = r4.0.2 > -PKG = libdrm2 > +PV = 2.4.44 > +PR = r0 > +PKGR = r0.0 > RPROVIDES = > -RDEPENDS = eglibc (>= 2.17) > +RDEPENDS = eglibc (>= 2.17) libdrm-kms (>= 2.4.44) > RRECOMMENDS = > -PKGSIZE = 34635 > +PKGSIZE = 46491 > FILES = /usr/bin/* /usr/sbin/* /usr/lib/libdrm/* /usr/lib/lib*.so.* /etc /com /var /bin/* /sbin/* /lib/*.so.* /lib/udev/rules.d /usr/lib/udev/rules.d /usr/share/libdrm /usr/lib/libdrm/* /usr/share/pixmaps /usr/share/applications /usr/share/idl /usr/share/omf /usr/share/sounds /usr/lib/bonobo/servers > -FILELIST = /usr/lib/libdrm.so.2 /usr/lib/libdrm.so.2.4.0 > +FILELIST = /usr/bin/kmstest /usr/bin/vbltest /usr/lib/libdrm.so.2 /usr/lib/libdrm.so.2.4.0 > No, I didn't use buildhistory on this... :( My bad. I just wasn't expecting the PKG to change. It looks like I was wrong. Thanks for reminding me. Hopefully, I'll remember it next time. I agree that the tests should be in a separate package. I'll make the change as soon as I find some time. Thanks, Laurentiu ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] libdrm: fix packaging after last upgrade 2013-05-23 8:26 ` Laurentiu Palcu @ 2013-05-23 8:55 ` Martin Jansa 2013-05-23 9:08 ` Burton, Ross 0 siblings, 1 reply; 5+ messages in thread From: Martin Jansa @ 2013-05-23 8:55 UTC (permalink / raw) To: openembedded-core * 2.4.44 adds 2 more tests kmstest and vbltest which got packaged to PN, causing PKG rename and breaking upgrade path * check_data_file_clashes: Package libdrm wants to install file /usr/lib/libdrm.so.2 But that file is already provided by package * libdrm2 * check_data_file_clashes: Package libdrm wants to install file /usr/lib/libdrm.so.2.4.0 But that file is already provided by package * libdrm2 put them to PN-tests where they belong Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/recipes-graphics/drm/libdrm.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc index e395e03..497220f 100644 --- a/meta/recipes-graphics/drm/libdrm.inc +++ b/meta/recipes-graphics/drm/libdrm.inc @@ -11,6 +11,7 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" PROVIDES = "drm" DEPENDS = "libpthread-stubs udev" +# be aware that libdrm_2.4.44.bb ignores this INC_PR = "r4" #libpciaccess is required starting from libdrm 2.4.26 @@ -29,7 +30,7 @@ PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ RDEPENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ ${PN}-exynos" -FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*" +FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" -- 1.8.2.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] libdrm: fix packaging after last upgrade 2013-05-23 8:55 ` [PATCH] libdrm: fix packaging after last upgrade Martin Jansa @ 2013-05-23 9:08 ` Burton, Ross 2013-05-24 20:48 ` Martin Jansa 0 siblings, 1 reply; 5+ messages in thread From: Burton, Ross @ 2013-05-23 9:08 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core On 23 May 2013 09:55, Martin Jansa <martin.jansa@gmail.com> wrote: > -FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*" > +FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" Why not just capture ${bindir}/* and we won't have this problem in the future? Ross ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] libdrm: fix packaging after last upgrade 2013-05-23 9:08 ` Burton, Ross @ 2013-05-24 20:48 ` Martin Jansa 0 siblings, 0 replies; 5+ messages in thread From: Martin Jansa @ 2013-05-24 20:48 UTC (permalink / raw) To: Burton, Ross; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 663 bytes --] On Thu, May 23, 2013 at 10:08:23AM +0100, Burton, Ross wrote: > On 23 May 2013 09:55, Martin Jansa <martin.jansa@gmail.com> wrote: > > -FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode*" > > +FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" > > Why not just capture ${bindir}/* and we won't have this problem in the future? No special reason, just kept it as it was introduced in ancient history: commit 1370ba3fc0b554fd9edd4ede653f7e3e8413ec3d Author: Richard Purdie <rpurdie@linux.intel.com> Date: Tue Apr 21 17:37:39 2009 +0100 libdrm: Package test utils -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-05-24 20:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20130512163307.035FC504FC@opal>
2013-05-22 16:07 ` [oe-commits] Laurentiu Palcu : libdrm: upgrade to 2.4.44 Martin Jansa
2013-05-23 8:26 ` Laurentiu Palcu
2013-05-23 8:55 ` [PATCH] libdrm: fix packaging after last upgrade Martin Jansa
2013-05-23 9:08 ` Burton, Ross
2013-05-24 20:48 ` Martin Jansa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox