From 99ad1a0da5520f0a15a17d95772c4e4bf70f2436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 11 Oct 2018 14:15:48 +0200 Subject: [PATCH] packagegroup-gnome-fonts: remove and move contents to packagegroup-image-base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../packagegroups/packagegroup-gnome-fonts.bb | 17 ----------------- .../packagegroups/packagegroup-image-base.bb | 4 +++- 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 recipes-image/packagegroups/packagegroup-gnome-fonts.bb diff --git a/recipes-image/packagegroups/packagegroup-gnome-fonts.bb b/recipes-image/packagegroups/packagegroup-gnome-fonts.bb deleted file mode 100644 index a86f003..0000000 --- a/recipes-image/packagegroups/packagegroup-gnome-fonts.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Task for a GNOME fonts" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -PR = "r13" - -inherit packagegroup - -# for backwards compatibility -RPROVIDES_${PN} += "packagegroup-gnome3-fonts" - -RDEPENDS_${PN} = " \ - fontconfig fontconfig-utils font-util \ - ttf-liberation-sans \ - ttf-liberation-serif \ - ttf-liberation-mono \ -" diff --git a/recipes-image/packagegroups/packagegroup-image-base.bb b/recipes-image/packagegroups/packagegroup-image-base.bb index 03e3a61..9ce9cfd 100644 --- a/recipes-image/packagegroups/packagegroup-image-base.bb +++ b/recipes-image/packagegroups/packagegroup-image-base.bb @@ -5,8 +5,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup RDEPENDS_${PN} = " \ - packagegroup-gnome-fonts \ ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-common \ + ttf-liberation-sans ttf-liberation-mono ttf-liberation-serif \ + \ + fontconfig fontconfig-utils font-util \ \ gedit gtksourceview-classic-light \ xarchiver \