From patchwork Wed Mar 12 03:45:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 329283 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 299292C00C3 for ; Wed, 12 Mar 2014 14:46:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0E3D6331B7; Wed, 12 Mar 2014 03:46:18 +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 ThkA3QJfU2ZR; Wed, 12 Mar 2014 03:46:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 502F133197; Wed, 12 Mar 2014 03:46:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5391F1C25F1 for ; Wed, 12 Mar 2014 03:46:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 502C58C3D0 for ; Wed, 12 Mar 2014 03:46:08 +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 mlo9xndTEADM for ; Wed, 12 Mar 2014 03:46:07 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from ozlabs.org (ozlabs.org [203.10.76.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id 406B98C39A for ; Wed, 12 Mar 2014 03:46:07 +0000 (UTC) Received: by ozlabs.org (Postfix, from userid 1023) id A91092C00CA; Wed, 12 Mar 2014 14:46:04 +1100 (EST) MIME-Version: 1.0 Message-Id: <1394595957.565885.179025903671.6.gpush@pablo> In-Reply-To: <1394595957.563937.119075350083.0.gpush@pablo> To: buildroot@busybox.net From: Jeremy Kerr Date: Wed, 12 Mar 2014 11:45:57 +0800 Subject: [Buildroot] [PATCH 06/10 v2] package/powerpc-utils: Add powerpc hardware utilities X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This change adds a package definition for the powerpc-utils project, containing a set of powerpc-specific hardware management utilities. We're using a git tag from upstream, which contains a few build-system fixes. Signed-off-by: Jeremy Kerr --- package/Config.in | 1 package/powerpc-utils/Config.in | 5 package/powerpc-utils/powerpc-utils-01-add-subdir-objects-automake-option.patch | 71 ++++++++++ package/powerpc-utils/powerpc-utils.mk | 16 ++ 4 files changed, 93 insertions(+) diff --git a/package/Config.in b/package/Config.in index 70e5a7f..5fe0594 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1062,6 +1062,7 @@ source "package/monit/Config.in" source "package/ncdu/Config.in" source "package/numactl/Config.in" source "package/nut/Config.in" +source "package/powerpc-utils/Config.in" source "package/polkit/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/procps/Config.in" diff --git a/package/powerpc-utils/Config.in b/package/powerpc-utils/Config.in new file mode 100644 index 0000000..c919094 --- /dev/null +++ b/package/powerpc-utils/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_POWERPC_UTILS + bool "powerpc-utils" + select BR2_PACKAGE_ZLIB + help + System utilities for powerpc machines diff --git a/package/powerpc-utils/powerpc-utils-01-add-subdir-objects-automake-option.patch b/package/powerpc-utils/powerpc-utils-01-add-subdir-objects-automake-option.patch new file mode 100644 index 0000000..0311280 --- /dev/null +++ b/package/powerpc-utils/powerpc-utils-01-add-subdir-objects-automake-option.patch @@ -0,0 +1,71 @@ +From c9e3c0cde53b4b77728590bd2375e62a3dfaaf62 Mon Sep 17 00:00:00 2001 +From: Jeremy Kerr +Date: Wed, 12 Mar 2014 10:43:46 +0800 +Subject: [PATCH] automake: Add subdir-objects automake option + +Current git builds fail for me, with: + + configure.ac:13: installing 'build-aux/compile' + automake: warnings are treated as errors + src/Makefile.am:8: warning: source file 'common/pseries_platform.c' is in a subdirectory, + src/Makefile.am:8: but option 'subdir-objects' is disabled + automake: warning: possible forward-incompatibility. + automake: At least a source file is in a subdirectory, but the 'subdir-objects' + automake: automake option hasn't been enabled. For now, the corresponding output + automake: object file(s) will be placed in the top-level directory. However, + automake: this behaviour will change in future Automake versions: they will + automake: unconditionally cause object files to be placed in the same subdirectory + automake: of the corresponding sources. + automake: You are advised to start using 'subdir-objects' option throughout your + automake: project, to avoid future incompatibilities. + src/drmgr/Makefile.am:9: warning: source file '$(COM_DIR)/pseries_platform.c' is in a subdirectory, + src/drmgr/Makefile.am:9: but option 'subdir-objects' is disabled + autoreconf: automake failed with exit status: 1 + +Using: + +automake (GNU automake) 1.14.1 + +Since we're using objects in subdirectories, we need the subdir-objects +atuomake option. + +Signed-off-by: Jeremy Kerr +--- + Makefile.am | 2 +- + src/Makefile.am | 2 ++ + src/drmgr/Makefile.am | 2 ++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 35df9f7..b3309c7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-AUTOMAKE_OPTIONS = foreign ++AUTOMAKE_OPTIONS = foreign subdir-objects + SUBDIRS = src man scripts + + docdir = $(datadir)/doc/packages/@PACKAGE@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 8f17cd2..18403b8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,3 +1,5 @@ ++AUTOMAKE_OPTIONS = subdir-objects ++ + AM_CFLAGS = -Wall -g -I common/ + AM_LDFLAGS = + +diff --git a/src/drmgr/Makefile.am b/src/drmgr/Makefile.am +index 2127b0d..4255fac 100644 +--- a/src/drmgr/Makefile.am ++++ b/src/drmgr/Makefile.am +@@ -1,3 +1,5 @@ ++AUTOMAKE_OPTIONS = subdir-objects ++ + COM_DIR = $(top_srcdir)/src/common + + AM_CFLAGS = -Wall -g -I $(COM_DIR) +-- +1.8.3.2 + diff --git a/package/powerpc-utils/powerpc-utils.mk b/package/powerpc-utils/powerpc-utils.mk new file mode 100644 index 0000000..6f8448c --- /dev/null +++ b/package/powerpc-utils/powerpc-utils.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# powerpc-utils +# +################################################################################ + +POWERPC_UTILS_VERSION = 64fe85e9473d05607dd8deda5023c7dd426216a5 +POWERPC_UTILS_SITE = git://git.code.sf.net/p/powerpc-utils/powerpc-utils +POWERPC_UTILS_AUTORECONF = YES +POWERPC_UTILS_DEPENDENCIES = zlib +POWERPC_UTILS_LICENSE = Common Public License Version 1.0 +POWERPC_UTILS_LICENSE_FILES = COPYRIGHT + +POWERPC_UTILS_CONF_OPT = --without-librtas + +$(eval $(autotools-package))