[oe-commits] org.oe.dev matchbox-panel: Test GUI_MACHINE_CLASS using base_conditional(), instead of

[pfalcon commit]

matchbox-panel: Test GUI_MACHINE_CLASS using base_conditional(), instead of 
double indirection trick, should be more robust and fix issues seen.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 18d4581dca99c8e61139671a08cebbf98f7a7f1a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=18d4581dca99c8e61139671a08cebbf98f7a7f1a
Files:
1
packages/matchbox-panel/matchbox-panel.inc
packages/matchbox-panel/matchbox-panel_0.9.3.bb
Diffs:

#
# mt diff -r1f5c493b4303e65b05567cdcc737645e2cff5227 -r18d4581dca99c8e61139671a08cebbf98f7a7f1a
#
# 
# 
# patch "packages/matchbox-panel/matchbox-panel.inc"
#  from [13fe45a963c5c34a98373ea6d38c0c44699a46cc]
#    to [01058fc9c74d54476cf7f80348631c13e3870786]
# 
# patch "packages/matchbox-panel/matchbox-panel_0.9.3.bb"
#  from [ad2497a4ebc1585a7fe03a31be3f680b954eb5b2]
#    to [88bb4cd140f00eb927baad4ef7d871698a529cad]
# 
============================================================
--- packages/matchbox-panel/matchbox-panel.inc	13fe45a963c5c34a98373ea6d38c0c44699a46cc
+++ packages/matchbox-panel/matchbox-panel.inc	01058fc9c74d54476cf7f80348631c13e3870786
@@ -1,19 +1,16 @@ SECTION = "x11/wm"
 DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
 SECTION = "x11/wm"
 
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig gettext
 
 CFLAGS += "-D_GNU_SOURCE"
 
-CONF_bigscreen = ""
-CONF_smallscreen = " --enable-small-icons "
-
 EXTRA_OECONF = " --enable-startup-notification --enable-dnotify "
-EXTRA_OECONF_append = ${CONF_${GUI_MACHINE_CLASS}}
+EXTRA_OECONF_append = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "", " --enable-small-icons ", d)}'
 PACKAGE_ARCH = "${MACHINE}"
 
 FILES_${PN} = "${bindir}/* \
============================================================
--- packages/matchbox-panel/matchbox-panel_0.9.3.bb	ad2497a4ebc1585a7fe03a31be3f680b954eb5b2
+++ packages/matchbox-panel/matchbox-panel_0.9.3.bb	88bb4cd140f00eb927baad4ef7d871698a529cad
@@ -1,4 +1,4 @@ require matchbox-panel.inc
 require matchbox-panel.inc
-PR="r1"
+PR="r2"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \
 	   file://mb-applet-battery-repaint-093.patch;patch=1"