Skip to contentSkip to conversation

Laurentiu Palcu : libdrm: upgrade to 2.4.44

oe-commits In review Martin Jansa 3 participants 5 messages May 22, 2013 – May 24, 2013 1 message not in the archive

lore
Share & tools
lore

Martin Jansa

author
#1 lore raw
In reply to a message not in the archive
Quoted 8 lines · On Sun, May 12, 2013 at 04:33:07PM +0000, [email protected] 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 <[email protected]>
Date:   Fri May 10 16:23:33 2013 +0300
Quoted 7 lines

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 <[email protected]>
Signed-off-by Saul Wold <[email protected]>

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

Quoted 90 lines

---

 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(-)
meta/recipes-graphics/drm/libdrm.inc +1 -0
index 9c1124e..e395e03 100644
@@ -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 \
meta/recipes-graphics/drm/libdrm/installtests.patch +0 -26
index 1f39719..7d443af 100644
@@ -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 = \
meta/recipes-graphics/drm/libdrm_2.4.42.bb deleted +0 -10
deleted file mode 100644
index 67ae2e6..0000000
@@ -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"
meta/recipes-graphics/drm/libdrm_2.4.44.bb new file +8 -0
new file mode 100644
index 0000000..b016958
@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
Quoted 37 lines · Martin Jansa
Quoted 8 lines · On Sun, May 12, 2013 at 04:33:07PM +0000, [email protected] wrote:
Quoted 8 lines
Module: openembedded-core.git
Branch: master
Commit: 563edb321594b007cae2294e807235ad22fd27da
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=563edb321594b007cae2294e807235ad22fd27da
Author: Laurentiu Palcu <[email protected]>
Date:   Fri May 10 16:23:33 2013 +0300
Quoted 7 lines
Quoted 7 lines

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 <[email protected]>
Signed-off-by Saul Wold <[email protected]>

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

(quoted diff) +2 -4
-PV = 2.4.42
-PR = r4.0
-PKGR = r4.0.2
-PKG = libdrm2
+PV = 2.4.44
+PR = r0

Review

Quoted 10 lines
(quoted diff) +4 -3
+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

author
#3 lore raw

PATCH 1/1 libdrm: fix packaging after last upgrade

* 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 <[email protected]>
---
 meta/recipes-graphics/drm/libdrm.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-graphics/drm/libdrm.inc +2 -1
index e395e03..497220f 100644
@@ -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.*"
Signature · 1 line
1.8.2.1
#4 lore raw

Re: [PATCH] libdrm: fix packaging after last upgrade

meta/recipes-graphics/drm/libdrm.inc PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ · line 33

Quoted 2 lines · Martin Jansa
meta/recipes-graphics/drm/libdrm.inc +1 -1
-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

author
#5 lore raw

Re: [PATCH] libdrm: fix packaging after last upgrade

Quoted 5 lines · Ross

meta/recipes-graphics/drm/libdrm.inc PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ · line 33

Quoted 2 lines · Martin Jansa
meta/recipes-graphics/drm/libdrm.inc +1 -1
-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 <[email protected]>
Date:   Tue Apr 21 17:37:39 2009 +0100

libdrm: Package test utils

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]