Misc fixings for multilib

PATCH Superseded Lianhao Lu 4 participants 11 messages Apr 27, 2012

Share & tools

Lianhao Lu

author

2012-04-27 05:14 UTC #0 lore raw

cover Misc fixings for multilib

1. Added a package QA check function in multilib case. It checkes whether there is a package runtime dependency on packages with names not prefixed by $MLPREFIX.

2. Fixed a bunch of recipes to use $libdir and $base_libdir instead of the hard coded /usr/lib and /lib.

The following changes since commit 5a1f172d35be610688842a8a9a84f24edb9aeb51:
Martin Jansa (1):
bitbake.conf: use TUNE_PKGARCH instead of TARGET_ARCH in SDK_NAME

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/multilib
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/multilib

Lianhao Lu (7):
multilib.bbclass: Added multilib specific package QA.
popt: Fixing pkgconfig file installation issue.
avahi: not using hard coded libdir.
pulseaudio: use base_libdir for udev rules.
alsa-utils: use base_libdir for udev rules.
xorg-app: Use ${libdir} for packaging.
xf86-input-vmmouse: use base_libdir for udev rules.

 meta/classes/multilib.bbclass                      |   31 ++++++++++++++++++++
 meta/recipes-connectivity/avahi/avahi.inc          |    4 +-
 meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb  |    2 +-
 .../recipes-graphics/xorg-app/mkfontscale_1.1.0.bb |    2 +
 meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb    |    2 +-
 meta/recipes-graphics/xorg-app/xauth_1.0.6.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb   |    2 +-
 meta/recipes-graphics/xorg-app/xhost_1.0.4.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xinit_1.3.2.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb     |    2 +-
 meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb    |    2 +
 meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb    |    2 +-
 meta/recipes-graphics/xorg-app/xorg-app-common.inc |    4 +-
 meta/recipes-graphics/xorg-app/xprop_1.2.1.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb     |    2 +-
 meta/recipes-graphics/xorg-app/xset_1.2.2.bb       |    2 +-
 meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb     |    1 +
 meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb   |    2 +-
 .../xorg-driver/xf86-input-vmmouse_12.8.0.bb       |    6 +++-
 meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb  |    6 ++-
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    1 +
 .../pulseaudio/pulseaudio_1.1.bb                   |    2 +-
 meta/recipes-support/popt/popt/pkgconfig_fix.patch |   15 +++++++++
 meta/recipes-support/popt/popt_1.16.bb             |    6 ++-
 24 files changed, 82 insertions(+), 22 deletions(-)
 create mode 100644 meta/recipes-support/popt/popt/pkgconfig_fix.patch

Lianhao Lu

author

2012-04-27 05:14 UTC #1 lore raw

PATCH 1/7 multilib.bbclass: Added multilib specific package QA.

Added a new PACKAGEFUNCS function to check the multilib packages' dependency.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/classes/multilib.bbclass |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

meta/classes/multilib.bbclass +31 -0

index c2d2f85..58cd113 100644
@@ -66,3 +66,34 @@ python __anonymous () {
     clsextend.map_variable("PACKAGE_INSTALL")
     clsextend.map_variable("INITSCRIPT_PACKAGES")
 }
+
+PACKAGEFUNCS_append = "do_package_qa_multilib"
+
+python do_package_qa_multilib() {
+
+    def check_mlprefix(pkg, var, mlprefix):
+        values = bb.utils.explode_dep_versions(d.getVar('%s_%s' % (var, pkg), True) or d.getVar(var, True) or "")
+        candidates = []
+        for i in values.keys():
+            if i.startswith('virtual/'):
+                i = i[len('virtual/'):]
+            if not i.startswith(mlprefix):
+                candidates.append(i)
+        if len(candidates) > 0:
+            bb.warn("Multilib QA Issue: %s package %s - suspicious values '%s' in %s" 
+                   % (d.getVar('PN', True), pkg, ' '.join(candidates), var))
+
+    ml = d.getVar('MLPREFIX', True)
+    if not ml:
+        return
+
+    packages = d.getVar('PACKAGES', True)
+    for pkg in packages.split():
+        check_mlprefix(pkg, 'RDEPENDS', ml)
+        check_mlprefix(pkg, 'RPROVIDES', ml)
+        check_mlprefix(pkg, 'RRECOMMENDS', ml)
+        check_mlprefix(pkg, 'RSUGGESTS', ml)
+        check_mlprefix(pkg, 'RREPLACES', ml)
+        check_mlprefix(pkg, 'RCONFLICTS', ml)
+}
+

Signature · 1 line

1.7.0.4

Lianhao Lu

author

2012-04-27 05:14 UTC #2 lore raw

PATCH 2/7 popt: Fixing pkgconfig file installation issue.

Install the pkgconfig files into $(libdir) instead of $(prefix)/lib/.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/recipes-support/popt/popt/pkgconfig_fix.patch |   15 +++++++++++++++
 meta/recipes-support/popt/popt_1.16.bb             |    6 ++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/popt/popt/pkgconfig_fix.patch

meta/recipes-support/popt/popt/pkgconfig_fix.patch new file +15 -0

new file mode 100644
index 0000000..0bddbf8
@@ -0,0 +1,15 @@
+Upstream-Status: Pending
+
+Install the pkgconfig file into libdir.
+
+--- popt-1.16.orig/Makefile.am	2012-04-26 13:42:54.021139813 +0800
++++ popt-1.16/Makefile.am	2012-04-26 13:36:03.552096912 +0800
+@@ -47,7 +47,7 @@
+ libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
+ libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+ 
+-pkgconfigdir = $(prefix)/lib/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = popt.pc
+ 
+ if HAVE_LD_VERSION_SCRIPT

meta/recipes-support/popt/popt_1.16.bb +4 -2

index fa6c326..cd22e9a 100644
@@ -4,9 +4,11 @@ SECTION = "libs"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz"
+SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \
+           file://pkgconfig_fix.patch \
+          "
 
 SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33"
 SRC_URI[sha256sum] = "e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8"

Signature · 1 line

1.7.0.4

Lianhao Lu

author

2012-04-27 05:14 UTC #3 lore raw

PATCH 3/7 avahi: not using hard coded libdir.

In reply to Lianhao Lu

Used ${libdir} instead of the hard docoded libdir.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/recipes-connectivity/avahi/avahi.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-connectivity/avahi/avahi.inc +2 -2

index 61ca25f..c064e03 100644
@@ -14,7 +14,7 @@ SECTION = "network"
 # python scripts are under GPLv2+
 LICENSE = "GPLv2+ & LGPLv2.1+"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 DEPENDS = "expat libcap libdaemon dbus glib-2.0"

@@ -112,7 +112,7 @@ do_install() {
 	# if /var/run become non-empty in the future, need to install it via volatile
 	rm -rf ${D}/var/run
 	rm -rf ${D}${datadir}/dbus-1/interfaces
-	rm -rf ${D}/usr/lib/avahi
+	rm -rf ${D}${libdir}/avahi
 }
 
 do_install_avahi-autoipd() {

Signature · 1 line

1.7.0.4

Lianhao Lu

author

2012-04-27 05:14 UTC #4 lore raw

PATCH 4/7 pulseaudio: use base_libdir for udev rules.

In reply to Lianhao Lu

Use the base_libdir to set the udev rules directory.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    1 +
 .../pulseaudio/pulseaudio_1.1.bb                   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

meta/recipes-multimedia/pulseaudio/pulseaudio.inc +1 -0

index a653af5..d2cf466 100644
@@ -32,6 +32,7 @@ EXTRA_OECONF = "\
 		--disable-hal \
 		--disable-orc \
 		--with-access-group=audio \
+		--with-udev-rules-dir=${base_libdir}/udev/rules.d \
 "
 
 PARALLEL_MAKE = ""

meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +1 -1

index fd61149..d2ed3c8 100644
@@ -1,6 +1,6 @@
 require pulseaudio.inc
 
-PR = "r8"
+PR = "r9"
 
 DEPENDS += "libjson gdbm speex libxml-parser-perl-native"

Signature · 1 line

1.7.0.4

Lianhao Lu

author

2012-04-27 05:14 UTC #5 lore raw

PATCH 5/7 alsa-utils: use base_libdir for udev rules.

In reply to Lianhao Lu

Use the base_libdir to set the udev rules directory.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb +4 -2

index 597e8b6..c39cd11 100644
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
 DEPENDS = "alsa-lib ncurses libsamplerate0"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://ncursesfix.patch \

@@ -21,7 +21,9 @@ SRC_URI[sha256sum] = "2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb61570
 # http://bugs.openembedded.org/show_bug.cgi?id=2348
 # please close bug and remove this comment when properly fixed
 #
-EXTRA_OECONF = "--disable-xmlto"
+EXTRA_OECONF = "--disable-xmlto \
+		--with-udev-rules-dir=${base_libdir}/udev/rules.d \
+		"
 EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
 
 inherit autotools gettext

Signature · 1 line

1.7.0.4

Richard Purdie

2012-04-27 10:57 UTC #6 lore raw

Re: [PATCH 5/7] alsa-utils: use base_libdir for udev rules.

Quoted 21 lines · Lianhao Lu

Use the base_libdir to set the udev rules directory.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb +1 -1

index 597e8b6..c39cd11 100644
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
 DEPENDS = "alsa-lib ncurses libsamplerate0"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://ncursesfix.patch \

meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb SRC_URI[sha256sum] = "2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb61570 · line 29

Quoted 10 lines

meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb +3 -1

@@ -21,7 +21,9 @@ SRC_URI[sha256sum] = "2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb61570
 # http://bugs.openembedded.org/show_bug.cgi?id=2348
 # please close bug and remove this comment when properly fixed
 #
-EXTRA_OECONF = "--disable-xmlto"
+EXTRA_OECONF = "--disable-xmlto \
+		--with-udev-rules-dir=${base_libdir}/udev/rules.d \
+		"
 EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
 
 inherit autotools gettext

The udev configuration files are probably one case where using /lib makes a lot of sense since we should only have one set of these. I therefore think this should be added as an exception to the sanity test...

Cheers,

Richard

Koen Kooi

2012-04-27 11:32 UTC #7 lore raw

Re: [PATCH 5/7] alsa-utils: use base_libdir for udev rules.

Op 27 apr. 2012, om 12:47 heeft Richard Purdie het volgende geschreven:

Quoted 31 lines · Lianhao Lu

Quoted 30 lines
Use the base_libdir to set the udev rules directory.
Signed-off-by Lianhao Lu <[email protected]>
---
meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb +0 -0
index 597e8b6..c39cd11 100644
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                    file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
DEPENDS = "alsa-lib ncurses libsamplerate0"
meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb +1 -1
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
           file://ncursesfix.patch \
meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb +3 -1
@@ -21,7 +21,9 @@ SRC_URI[sha256sum] = "2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb61570
 # http://bugs.openembedded.org/show_bug.cgi?id=2348
 # please close bug and remove this comment when properly fixed
 #
-EXTRA_OECONF = "--disable-xmlto"
+EXTRA_OECONF = "--disable-xmlto \
+		--with-udev-rules-dir=${base_libdir}/udev/rules.d \
+		"
EXTRA_OECONF_append_libc-uclibc = " --disable-nls"

Quoted 6 lines

Quoted 1 line
inherit autotools gettext
The udev configuration files are probably one case where using /lib makes a lot of sense since we should only have one set of these. I therefore think this should be added as an exception to the sanity test...

And keep in mind it's more '/lib' than '${base_libdir}' since it isn't supposed to adhere to multilib naming. So even on /lib64 machines the rules are in /lib.

regards,

Koen

Lianhao Lu

author

2012-04-27 05:14 UTC #8 lore raw

PATCH 6/7 xorg-app: Use ${libdir} for packaging.

In reply to Lianhao Lu

Used ${libdir} instead of hard coded "/usr/lib" for packaging.

Also included INC_PR in PR.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb  |    2 +-
 .../recipes-graphics/xorg-app/mkfontscale_1.1.0.bb |    2 ++
 meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb    |    2 +-
 meta/recipes-graphics/xorg-app/xauth_1.0.6.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb   |    2 +-
 meta/recipes-graphics/xorg-app/xhost_1.0.4.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xinit_1.3.2.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb     |    2 +-
 meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb    |    2 ++
 meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb    |    2 +-
 meta/recipes-graphics/xorg-app/xorg-app-common.inc |    4 ++--
 meta/recipes-graphics/xorg-app/xprop_1.2.1.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb     |    2 +-
 meta/recipes-graphics/xorg-app/xset_1.2.2.bb       |    2 +-
 meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb     |    1 +
 meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb   |    2 +-
 16 files changed, 19 insertions(+), 14 deletions(-)

meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb +1 -1

index db6d2b4..6637326 100644
@@ -9,7 +9,7 @@ The X server and font server use these files to find the available font \
 files."
 
 PE = "1"
-PR = "r0"
+PR = "${INC_PR}.0"
 
 RDEPENDS_${PN} += "mkfontscale"
 RDEPENDS_${PN}_virtclass-native += "mkfontscale-native"

meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb +2 -0

index 49706e5..d98057b 100644
@@ -10,6 +10,8 @@ is used by the mkfontdir program."
 
 DEPENDS += " zlib libfontenc freetype virtual/libx11"
 
+PR = "${INC_PR}.0"
+
 BBCLASSEXTEND = "native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f"

meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb +1 -1

index 15fa314..cc0b323 100644
@@ -11,7 +11,7 @@ DEPENDS += "libxmu libxrender libxft libxext fontconfig"
 LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \
                     file://x11perf.h;endline=24;md5=29555066baf406a105ff917ac25b2d01"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 FILES_${PN} += "${libdir}/X11/x11perfcomp/*"

meta/recipes-graphics/xorg-app/xauth_1.0.6.bb +1 -1

index f00d30a..c43d0eb 100644
@@ -6,7 +6,7 @@ information used in connecting to the X server."
 LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b"
 
 DEPENDS += "libxau libxext libxmu"
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "105f5b00bb9293b3db36f7e500d4f950"

meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb +1 -1

index a118d0d..ae3cc8c 100644
@@ -10,7 +10,7 @@ that are available."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
 DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"

meta/recipes-graphics/xorg-app/xhost_1.0.4.bb +1 -1

index 9330228..7a78f80 100644
@@ -11,7 +11,7 @@ protocol for passing other authentication data to the server."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199"
 DEPENDS += "libxmu libxau"
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "2be663a0afbcc0856c1591477d5bf32a"

meta/recipes-graphics/xorg-app/xinit_1.3.2.bb +1 -1

index cb3e028..2008e79 100644
@@ -10,7 +10,7 @@ then terminate."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "9c0943cbd83e489ad1b05221b97efd44"

meta/recipes-graphics/xorg-app/xinput_1.5.3.bb +1 -1

index 8f17e9a..6790f60 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0"
 
 DEPENDS += " libxi"
 
-PR = "r7"
+PR = "${INC_PR}.7"
 
 SRC_URI[md5sum] = "1e2f0ad4f3fa833b65c568907f171d28"
 SRC_URI[sha256sum] = "6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76"

meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb +2 -0

index d8b3e7a..f5f0870 100644
@@ -9,6 +9,8 @@ be read directly by XKB-capable X servers or utilities."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a"
 
+PR = "${INC_PR}.0"
+
 DEPENDS += "libxkbfile"
 
 SRC_URI[md5sum] = "35622a497894c1cff9182d42696c3e27"

meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb +1 -1

index e98ed4f..2c9ecde 100644
@@ -11,7 +11,7 @@ according to personal tastes."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eef098b27f09d0ac39268df0cc2c00b5"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "b18850d373f3717dca569377c449d091"

meta/recipes-graphics/xorg-app/xorg-app-common.inc +2 -2

index 890648b..d0b4b65 100644
@@ -5,7 +5,7 @@ SECTION = "x11/apps"
 LICENSE = "MIT-X"
 DEPENDS = "util-macros-native virtual/libx11"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"

@@ -13,4 +13,4 @@ S = "${WORKDIR}/${BPN}-${PV}"
 
 inherit autotools pkgconfig
 
-FILES_${PN} += "  /usr/lib/X11/${BPN} /usr/share/X11/app-defaults/"
+FILES_${PN} += " ${libdir}/X11/${BPN} /usr/share/X11/app-defaults/"

meta/recipes-graphics/xorg-app/xprop_1.2.1.bb +1 -1

index 6c07230..c74beb4 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91"
 
 DEPENDS += " libxmu virtual/libx11"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "d5529dc8d811efabd136ca2d8e857deb"

meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb +1 -1

index 4410865..da83e8f 100644
@@ -10,7 +10,7 @@ LICENSE= "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3"
 DEPENDS += "libxrandr libxrender"
 PE = "1"
-PR = "r1"
+PR = "${INC_PR}.1"
 
 SRC_URI[md5sum] = "9735173a84dca9b05e06fd4686196b07"
 SRC_URI[sha256sum] = "1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e"

meta/recipes-graphics/xorg-app/xset_1.2.2.bb +1 -1

index 7d5ac49..0430f8c 100644
@@ -8,7 +8,7 @@ preference options of the display."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"

meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb +1 -0

index 7a0b822..66d2561 100644
@@ -9,6 +9,7 @@ extension."
 LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68"
 DEPENDS += " libxv"
 PE = "1"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "c88feb501083951a8f47a21aaeb1529d"
 SRC_URI[sha256sum] = "60c74aa190bcf1e244f6f1576dc43869018a8ed5ba319703a5c198d3466a3985"

meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb +1 -1

index cbc4587..c033e2b 100644
@@ -9,7 +9,7 @@ and a number of other items."
 LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e"
 DEPENDS += "libxext libxmu"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "0"
 
 SRC_URI[md5sum] = "9e8b58c8aa6172e87ab4f9cf3612fedd"

Signature · 1 line

1.7.0.4

Martin Jansa

2012-04-27 05:46 UTC #9 lore raw

Re: [PATCH 6/7] xorg-app: Use ${libdir} for packaging.

Quoted 168 lines · Lianhao Lu

Used ${libdir} instead of hard coded "/usr/lib" for packaging.

Also included INC_PR in PR.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb  |    2 +-
 .../recipes-graphics/xorg-app/mkfontscale_1.1.0.bb |    2 ++
 meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb    |    2 +-
 meta/recipes-graphics/xorg-app/xauth_1.0.6.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb   |    2 +-
 meta/recipes-graphics/xorg-app/xhost_1.0.4.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xinit_1.3.2.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xinput_1.5.3.bb     |    2 +-
 meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb    |    2 ++
 meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb    |    2 +-
 meta/recipes-graphics/xorg-app/xorg-app-common.inc |    4 ++--
 meta/recipes-graphics/xorg-app/xprop_1.2.1.bb      |    2 +-
 meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb     |    2 +-
 meta/recipes-graphics/xorg-app/xset_1.2.2.bb       |    2 +-
 meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb     |    1 +
 meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb   |    2 +-
 16 files changed, 19 insertions(+), 14 deletions(-)

meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb +1 -1

index db6d2b4..6637326 100644
@@ -9,7 +9,7 @@ The X server and font server use these files to find the available font \
 files."
 
 PE = "1"
-PR = "r0"
+PR = "${INC_PR}.0"
 
 RDEPENDS_${PN} += "mkfontscale"
 RDEPENDS_${PN}_virtclass-native += "mkfontscale-native"

meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb +2 -0

index 49706e5..d98057b 100644
@@ -10,6 +10,8 @@ is used by the mkfontdir program."
 
 DEPENDS += " zlib libfontenc freetype virtual/libx11"
 
+PR = "${INC_PR}.0"
+
 BBCLASSEXTEND = "native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f"

meta/recipes-graphics/xorg-app/x11perf_1.5.4.bb +1 -1

index 15fa314..cc0b323 100644
@@ -11,7 +11,7 @@ DEPENDS += "libxmu libxrender libxft libxext fontconfig"
 LIC_FILES_CHKSUM = "file://COPYING;md5=428ca4d67a41fcd4fc3283dce9bbda7e \
                     file://x11perf.h;endline=24;md5=29555066baf406a105ff917ac25b2d01"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 FILES_${PN} += "${libdir}/X11/x11perfcomp/*"

meta/recipes-graphics/xorg-app/xauth_1.0.6.bb +1 -1

index f00d30a..c43d0eb 100644
@@ -6,7 +6,7 @@ information used in connecting to the X server."
 LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b"
 
 DEPENDS += "libxau libxext libxmu"
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "105f5b00bb9293b3db36f7e500d4f950"

meta/recipes-graphics/xorg-app/xdpyinfo_1.3.0.bb +1 -1

index a118d0d..ae3cc8c 100644
@@ -10,7 +10,7 @@ that are available."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
 DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"

meta/recipes-graphics/xorg-app/xhost_1.0.4.bb +1 -1

index 9330228..7a78f80 100644
@@ -11,7 +11,7 @@ protocol for passing other authentication data to the server."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199"
 DEPENDS += "libxmu libxau"
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "2be663a0afbcc0856c1591477d5bf32a"

meta/recipes-graphics/xorg-app/xinit_1.3.2.bb +1 -1

index cb3e028..2008e79 100644
@@ -10,7 +10,7 @@ then terminate."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=0d4b5eef75f1584ccbdc5e4a34314407"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "9c0943cbd83e489ad1b05221b97efd44"

meta/recipes-graphics/xorg-app/xinput_1.5.3.bb +1 -1

index 8f17e9a..6790f60 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0"
 
 DEPENDS += " libxi"
 
-PR = "r7"
+PR = "${INC_PR}.7"
 
 SRC_URI[md5sum] = "1e2f0ad4f3fa833b65c568907f171d28"
 SRC_URI[sha256sum] = "6aade131cecddaeefc39ddce1dd5e8473f6039c2e4efbfd9fbb5ee2a75885c76"

meta/recipes-graphics/xorg-app/xkbcomp_1.2.3.bb +2 -0

index d8b3e7a..f5f0870 100644
@@ -9,6 +9,8 @@ be read directly by XKB-capable X servers or utilities."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=08436e4f4476964e2e2dd7e7e41e076a"
 
+PR = "${INC_PR}.0"
+
 DEPENDS += "libxkbfile"
 
 SRC_URI[md5sum] = "35622a497894c1cff9182d42696c3e27"

meta/recipes-graphics/xorg-app/xmodmap_1.0.5.bb +1 -1

index e98ed4f..2c9ecde 100644
@@ -11,7 +11,7 @@ according to personal tastes."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eef098b27f09d0ac39268df0cc2c00b5"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "b18850d373f3717dca569377c449d091"

meta/recipes-graphics/xorg-app/xorg-app-common.inc +1 -1

index 890648b..d0b4b65 100644
@@ -5,7 +5,7 @@ SECTION = "x11/apps"
 LICENSE = "MIT-X"
 DEPENDS = "util-macros-native virtual/libx11"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"

meta/recipes-graphics/xorg-app/xorg-app-common.inc S = "${WORKDIR}/${BPN}-${PV}" · line 16

Quoted 5 lines

meta/recipes-graphics/xorg-app/xorg-app-common.inc +1 -1

@@ -13,4 +13,4 @@ S = "${WORKDIR}/${BPN}-${PV}"
 
 inherit autotools pkgconfig
 
-FILES_${PN} += "  /usr/lib/X11/${BPN} /usr/share/X11/app-defaults/"
+FILES_${PN} += " ${libdir}/X11/${BPN} /usr/share/X11/app-defaults/"

when rebuilding every xorg-app, can we also change ${datadir} here ^^

Cheers,

Quoted 72 lines

meta/recipes-graphics/xorg-app/xprop_1.2.1.bb +1 -1

index 6c07230..c74beb4 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91"
 
 DEPENDS += " libxmu virtual/libx11"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI[md5sum] = "d5529dc8d811efabd136ca2d8e857deb"

meta/recipes-graphics/xorg-app/xrandr_1.3.5.bb +1 -1

index 4410865..da83e8f 100644
@@ -10,7 +10,7 @@ LICENSE= "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3"
 DEPENDS += "libxrandr libxrender"
 PE = "1"
-PR = "r1"
+PR = "${INC_PR}.1"
 
 SRC_URI[md5sum] = "9735173a84dca9b05e06fd4686196b07"
 SRC_URI[sha256sum] = "1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e"

meta/recipes-graphics/xorg-app/xset_1.2.2.bb +1 -1

index 7d5ac49..0430f8c 100644
@@ -8,7 +8,7 @@ preference options of the display."
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
 DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"

meta/recipes-graphics/xorg-app/xvinfo_1.1.1.bb +1 -0

index 7a0b822..66d2561 100644
@@ -9,6 +9,7 @@ extension."
 LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68"
 DEPENDS += " libxv"
 PE = "1"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "c88feb501083951a8f47a21aaeb1529d"
 SRC_URI[sha256sum] = "60c74aa190bcf1e244f6f1576dc43869018a8ed5ba319703a5c198d3466a3985"

meta/recipes-graphics/xorg-app/xwininfo_1.1.2.bb +1 -1

index cbc4587..c033e2b 100644
@@ -9,7 +9,7 @@ and a number of other items."
 LIC_FILES_CHKSUM = "file://COPYING;md5=78976cd3115f6faf615accc4e094d90e"
 DEPENDS += "libxext libxmu"
 
-PR = "r0"
+PR = "${INC_PR}.0"
 PE = "0"
 
 SRC_URI[md5sum] = "9e8b58c8aa6172e87ab4f9cf3612fedd"

Signature · 7 lines

1.7.0.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Lianhao Lu

author

2012-04-27 05:14 UTC #10 lore raw

PATCH 7/7 xf86-input-vmmouse: use base_libdir for udev rules.

In reply to Lianhao Lu

Use the base_libdir to set the udev rules directory.

Signed-off-by Lianhao Lu <[email protected]>

---
 .../xorg-driver/xf86-input-vmmouse_12.8.0.bb       |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_12.8.0.bb +5 -1

index 150a9ed..e626a67 100644
@@ -1,7 +1,7 @@
 require xorg-driver-input.inc
 
 DESCRIPTION = "X.Org X server -- VMWare mouse input driver"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI[md5sum] = "15fce165117706cd5e774a8aa58122ce"
 SRC_URI[sha256sum] = "a8a6ec0b567c48c130ccb830e15dfc2b201831841de0c2cc56bd87256d2d869a"

@@ -12,6 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=622841c068a9d7625fbfe7acffb1a8fc"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
+EXTRA_OECONF = "\
+		--with-udev-rules-dir=${base_libdir}/udev/rules.d \
+		"
+
 do_install_append () {
 	# We don't care about hal
 	rm -rf ${D}${datadir}/hal/

Signature · 1 line

1.7.0.4