From patchwork Fri Sep 2 20:31:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 665315 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sQrQY0Y2tz9sDG for ; Sat, 3 Sep 2016 06:32:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=LpcWhUmo; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 965D791DD7; Fri, 2 Sep 2016 20:32:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nDo5w3EgP85R; Fri, 2 Sep 2016 20:32:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E69C891D93; Fri, 2 Sep 2016 20:31:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 563361C07A6 for ; Fri, 2 Sep 2016 20:31:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4F459317D3 for ; Fri, 2 Sep 2016 20:31:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3QJbxrZihD8X for ; Fri, 2 Sep 2016 20:31:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by silver.osuosl.org (Postfix) with ESMTPS id C833431E3C for ; Fri, 2 Sep 2016 20:31:47 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id i138so4236641wmf.3 for ; Fri, 02 Sep 2016 13:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=E37oh8+FOR48UeF1Irgz2USFfRpEwXqvLWsOXUR5l2Q=; b=LpcWhUmoJtNRgvjR/TNOLRMkCcmob0j5XjikdZjqYFJiFtuCmUGadI8Bwc7+wHFlil OOS82RKbSCIG9X/82LvT+jw8uLDvgJztG6uPp5mYs7T9jgf7VrpIUJtUOwTEwie77YVQ lRVb+Xq5ogBgtAxXqjBeMQyM4OOWcpD5bdT/5aP1aoRjtHi36+Y8qTnsPIsiFI4UTCK5 S2aSXZAiiOWLI4CPoZQhWvbS2snRhvX9mIhrkZgB8x+moFLYrKacsyETFL2YqU2A9MOK 7pZsr6+C024Nq7rU1RteBw6jglBKoeAEwS6zC5TYgvra68KSSrBhj2g+DBwlLvVbCSND DrqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=E37oh8+FOR48UeF1Irgz2USFfRpEwXqvLWsOXUR5l2Q=; b=Vj/PfSucqI28qa++aPlR9cfdPl5X0epwcp9kSl+2tHuYQaDnTp1q2tRVK+vsWoRcRi 4wGzPtVkCorHcYcJXVJhkiwUhkk30DUSvIAVK/wBkxaEh9eXT6Yk2sFfwEj+g1+c+NYw DYlImp3CZweK5VsMUEe//pyNMWcHu55B4ck5szRsiHTh4kMMy+pA1HOBT4h6FWhXMu3t pA15KCmqhMcdT9G411jZrgv9Ir/oSDm2h43W6df/25OQpaX7IqUbt6dFeLiXbKhrnk1s SZnG3P8eZIjDgm2sc3KCRuj8RzxcrC5IpvQiMFZS9i0t3ThqWA1L6D7jpQveMe/XCq2N pNSg== X-Gm-Message-State: AE9vXwPogwJX01VK5TZz12BzpvKIR7NYsTlpu22hdNkV0YGjjYLzVumTxvex6zugu7evnQ== X-Received: by 10.194.127.9 with SMTP id nc9mr23825473wjb.30.1472848306151; Fri, 02 Sep 2016 13:31:46 -0700 (PDT) Received: from atlas.localdomain.localdomain ([2a01:e35:1391:67d0:caf7:33ff:fe77:d120]) by smtp.gmail.com with ESMTPSA id b130sm5219161wmg.19.2016.09.02.13.31.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Sep 2016 13:31:45 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Fri, 2 Sep 2016 22:31:31 +0200 Message-Id: <1472848295-13734-5-git-send-email-romain.naour@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1472848295-13734-1-git-send-email-romain.naour@gmail.com> References: <1472848295-13734-1-git-send-email-romain.naour@gmail.com> Cc: Romain Naour Subject: [Buildroot] [PATCH 5/9] package/elementary: remove package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" elementary package is now used anymore, remove it. Add a legacy entry. Signed-off-by: Romain Naour --- Config.in.legacy | 7 ++++ package/Config.in | 1 - ...emove-.eo.h-files-from-includesub_HEADERS.patch | 45 -------------------- package/elementary/Config.in | 15 ------- package/elementary/elementary.hash | 2 - package/elementary/elementary.mk | 48 ---------------------- 6 files changed, 7 insertions(+), 111 deletions(-) delete mode 100644 package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch delete mode 100644 package/elementary/Config.in delete mode 100644 package/elementary/elementary.hash delete mode 100644 package/elementary/elementary.mk diff --git a/Config.in.legacy b/Config.in.legacy index 59e3f84..03ac4f8 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -157,6 +157,13 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL ############################################################################### comment "Legacy options removed in 2016.08" +config BR2_PACKAGE_ELEMENTARY + bool "elementary package removed" + select BR2_LEGACY + select BR2_PACKAGE_EFL + help + With EFL 1.18, elementary is now provided by the efl package. + config BR2_PACKAGE_SYSTEMD_COMPAT bool "systemd compatibility libraries have been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 6da9d7b..a577ad2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -245,7 +245,6 @@ comment "Graphic libraries" source "package/directfb/Config.in" source "package/directfb-examples/Config.in" source "package/efl/Config.in" - source "package/elementary/Config.in" source "package/fbdump/Config.in" source "package/fbgrab/Config.in" source "package/fbset/Config.in" diff --git a/package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch b/package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch deleted file mode 100644 index 75a36a2..0000000 --- a/package/elementary/0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2f6a65718a0992d0624836ce4b1416a7420782d2 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 25 Jul 2016 22:52:41 +0200 -Subject: [PATCH] lib: remove *.eo.h files from includesub_HEADERS - -Otherwise *.eo.h files will be installed twice, so it can break a -parallel install on fast machines, whereby two make jobs may run -concurrently, trying to install the same files. - -/usr/bin/install -c -m 644 elm_sys_notify.eo.h -/usr/bin/install -c -m 644 elm_sys_notify.eo.h -usr/bin/install: cannot create regular file 'elm_sys_notify.eo.h': File exists - -Fixes: -http://autobuild.buildroot.net/results/7e9/7e9caffe442dcf40ee41da56fd3f55ffedf3a291 - -Signed-off-by: Romain Naour ---- - src/lib/Makefile.am | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index 40fb597..9df9424 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -351,8 +351,6 @@ elm_systray_eo.h \ - elm_systray_common.h \ - elm_systray_watcher.h \ - elm_sys_notify.h \ --elm_sys_notify.eo.h \ --elm_sys_notify_dbus.eo.h \ - elm_table.h \ - elm_table_eo.h \ - elm_table_legacy.h \ -@@ -381,7 +379,6 @@ elm_win_common.h \ - elm_win_eo.h \ - elm_win_legacy.h \ - elm_win_standard.h \ --elm_win_standard.eo.h \ - elm_helper.h - includesubdir = $(includedir)/elementary-@VMAJ@/ - --- -2.5.5 - diff --git a/package/elementary/Config.in b/package/elementary/Config.in deleted file mode 100644 index f356784..0000000 --- a/package/elementary/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_ELEMENTARY - bool "elementary" - depends on BR2_PACKAGE_EFL - depends on BR2_TOOLCHAIN_HAS_THREADS # elm_store.c - depends on !BR2_STATIC_LIBS - help - Elementary is a widget toolkit and EFL wrapper and convenience - library to make it easy to build applications and tools with UIs - with less code. - - https://enlightenment.org - -comment "elementary needs a toolchain w/ threads, dynamic library" - depends on BR2_PACKAGE_EFL - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/elementary/elementary.hash b/package/elementary/elementary.hash deleted file mode 100644 index f173752..0000000 --- a/package/elementary/elementary.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://download.enlightenment.org/rel/libs/elementary/elementary-1.17.1.tar.xz.sha256 -sha256 85e116a453a8ac23da878670534c6292832756d2f3a33603278486f309963d91 elementary-1.17.1.tar.xz diff --git a/package/elementary/elementary.mk b/package/elementary/elementary.mk deleted file mode 100644 index e686647..0000000 --- a/package/elementary/elementary.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# elementary -# -################################################################################ - -ELEMENTARY_VERSION = 1.17.1 -ELEMENTARY_SOURCE = elementary-$(ELEMENTARY_VERSION).tar.xz -ELEMENTARY_SITE = http://download.enlightenment.org/rel/libs/elementary -ELEMENTARY_LICENSE = LGPLv2.1 -ELEMENTARY_LICENSE_FILES = COPYING - -# 0001-lib-remove-.eo.h-files-from-includesub_HEADERS.patch -ELEMENTARY_AUTORECONF = YES -ELEMENTARY_GETTEXTIZE = YES - -ELEMENTARY_INSTALL_STAGING = YES - -ELEMENTARY_DEPENDENCIES = host-pkgconf host-efl host-elementary efl - -ELEMENTARY_CONF_OPTS = \ - --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ - --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ - --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \ - --with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \ - --with-elementary-codegen=$(HOST_DIR)/usr/bin/elementary_codegen \ - --with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \ - --with-doxygen=no \ - --disable-elementary-test - -# We need a host package in order to provide elm_prefs_cc and -# elementary_codegen. -HOST_ELEMENTARY_DEPENDENCIES = host-pkgconf host-efl -HOST_ELEMENTARY_CONF_OPTS = \ - --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ - --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ - --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \ - --with-doxygen=no \ - --disable-elementary-test - -# Use Eolian C++ parser only if enabled in the efl stack. -ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y) -ELEMENTARY_CONF_OPTS += --with-eolian-cxx=$(HOST_DIR)/usr/bin/eolian_cxx -HOST_ELEMENTARY_CONF_OPTS += --with-eolian-cxx=$(HOST_DIR)/usr/bin/eolian_cxx -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package))