From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mail.openembedded.org (Postfix) with ESMTP id 6BBD57868C for ; Thu, 21 Dec 2017 13:10:07 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Dec 2017 05:10:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,435,1508828400"; d="scan'208";a="14537198" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by fmsmga004.fm.intel.com with ESMTP; 21 Dec 2017 05:10:08 -0800 From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Date: Thu, 21 Dec 2017 15:04:27 +0200 Message-Id: <20171221130434.24427-2-alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171221130434.24427-1-alexander.kanavin@linux.intel.com> References: <20171221130434.24427-1-alexander.kanavin@linux.intel.com> Subject: [PATCH 2/9] gnomebase.bbclass: split into autotools and meson versions X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 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: Thu, 21 Dec 2017 13:10:07 -0000 gnomebase.bbclass unfortunately hardcodes the autotools inherit, so we have to introduce gnomebase-nobuildsystem.bbclass where the common bits between autotools and meson classes can be placed. Signed-off-by: Alexander Kanavin --- meta/classes/gnomebase-meson.bbclass | 1 + meta/classes/gnomebase-nobuildsystem.bbclass | 27 +++++++++++++++++++++++++ meta/classes/gnomebase.bbclass | 30 +--------------------------- 3 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 meta/classes/gnomebase-meson.bbclass create mode 100644 meta/classes/gnomebase-nobuildsystem.bbclass diff --git a/meta/classes/gnomebase-meson.bbclass b/meta/classes/gnomebase-meson.bbclass new file mode 100644 index 00000000000..6cb97397572 --- /dev/null +++ b/meta/classes/gnomebase-meson.bbclass @@ -0,0 +1 @@ +inherit meson gnomebase-nobuildsystem diff --git a/meta/classes/gnomebase-nobuildsystem.bbclass b/meta/classes/gnomebase-nobuildsystem.bbclass new file mode 100644 index 00000000000..2ea7367a83a --- /dev/null +++ b/meta/classes/gnomebase-nobuildsystem.bbclass @@ -0,0 +1,27 @@ +def gnome_verdir(v): + return oe.utils.trim_version(v, 2) + +GNOME_COMPRESS_TYPE ?= "xz" +SECTION ?= "x11/gnome" +GNOMEBN ?= "${BPN}" +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" + +FILES_${PN} += "${datadir}/application-registry \ + ${datadir}/mime-info \ + ${datadir}/mime/packages \ + ${datadir}/mime/application \ + ${datadir}/gnome-2.0 \ + ${datadir}/polkit* \ + ${datadir}/GConf \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/appdata \ + ${datadir}/icons \ +" + +FILES_${PN}-doc += "${datadir}/devhelp" + +do_install_append() { + rm -rf ${D}${localstatedir}/lib/scrollkeeper/* + rm -rf ${D}${localstatedir}/scrollkeeper/* + rm -f ${D}${datadir}/applications/*.cache +} diff --git a/meta/classes/gnomebase.bbclass b/meta/classes/gnomebase.bbclass index 4ccc8e07814..84756aea1ec 100644 --- a/meta/classes/gnomebase.bbclass +++ b/meta/classes/gnomebase.bbclass @@ -1,29 +1 @@ -def gnome_verdir(v): - return oe.utils.trim_version(v, 2) - -GNOME_COMPRESS_TYPE ?= "xz" -SECTION ?= "x11/gnome" -GNOMEBN ?= "${BPN}" -SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" - -FILES_${PN} += "${datadir}/application-registry \ - ${datadir}/mime-info \ - ${datadir}/mime/packages \ - ${datadir}/mime/application \ - ${datadir}/gnome-2.0 \ - ${datadir}/polkit* \ - ${datadir}/GConf \ - ${datadir}/glib-2.0/schemas \ - ${datadir}/appdata \ - ${datadir}/icons \ -" - -FILES_${PN}-doc += "${datadir}/devhelp" - -inherit autotools pkgconfig - -do_install_append() { - rm -rf ${D}${localstatedir}/lib/scrollkeeper/* - rm -rf ${D}${localstatedir}/scrollkeeper/* - rm -f ${D}${datadir}/applications/*.cache -} +inherit autotools pkgconfig gnomebase-nobuildsystem -- 2.15.1