Re: [ptxdist] [PATCH] Add new package: dmidecode

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Mon, Nov 12, 2012 at 02:13:17PM +0100, Alexander Stein wrote:
> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
> ---
>  .../0001-build-system-Install-to-usr.patch         |   22 ++++++++
>  patches/dmidecode-2.11/series                      |    3 +
>  rules/dmidecode.in                                 |    7 +++
>  rules/dmidecode.make                               |   58 ++++++++++++++++++++
>  4 files changed, 90 insertions(+), 0 deletions(-)
>  create mode 100644 patches/dmidecode-2.11/0001-build-system-Install-to-usr.patch
>  create mode 100644 patches/dmidecode-2.11/series
>  create mode 100644 rules/dmidecode.in
>  create mode 100644 rules/dmidecode.make
> 
> diff --git a/patches/dmidecode-2.11/0001-build-system-Install-to-usr.patch b/patches/dmidecode-2.11/0001-build-system-Install-to-usr.patch
> new file mode 100644
> index 0000000..821859f
> --- /dev/null
> +++ b/patches/dmidecode-2.11/0001-build-system-Install-to-usr.patch
> @@ -0,0 +1,22 @@
> +From: Alexander Stein <alexander.stein@systec-electronic.com>
> +Date: Mon, 12 Nov 2012 13:58:09 +0100
> +Subject: [PATCH] build system: Install to /usr
> +
> +Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
> +---
> + Makefile |    2 +-
> + 1 files changed, 1 insertions(+), 1 deletions(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 55378bb..8dadefc 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -26,7 +26,7 @@ CFLAGS += -O2
> + LDFLAGS =
> + 
> + DESTDIR =
> +-prefix  = /usr/local
> ++prefix  = /usr/
> + sbindir = $(prefix)/sbin
> + mandir  = $(prefix)/share/man
> + man8dir = $(mandir)/man8
> diff --git a/patches/dmidecode-2.11/series b/patches/dmidecode-2.11/series
> new file mode 100644
> index 0000000..cab30d5
> --- /dev/null
> +++ b/patches/dmidecode-2.11/series
> @@ -0,0 +1,3 @@
> +# generated by git-ptx-patches
> +0001-build-system-Install-to-usr.patch
> +# 9b18c10df6220550360d2a01d0cdb697  - git-ptx-patches magic
> diff --git a/rules/dmidecode.in b/rules/dmidecode.in
> new file mode 100644
> index 0000000..d4ec1d4
> --- /dev/null
> +++ b/rules/dmidecode.in
> @@ -0,0 +1,7 @@
> +## SECTION=shell_and_console
> +
> +config DMIDECODE
> +	tristate
> +	prompt "dmidecode"
> +	help
> +	  DMI (Desktop Management Interface) table related utilities
> diff --git a/rules/dmidecode.make b/rules/dmidecode.make
> new file mode 100644
> index 0000000..49216bc
> --- /dev/null
> +++ b/rules/dmidecode.make
> @@ -0,0 +1,58 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Alexander Stein <alexander.stein@systec-electronic.com>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_DMIDECODE) += dmidecode
> +
> +#
> +# Paths and names
> +#
> +DMIDECODE_VERSION	:= 2.11
> +DMIDECODE_MD5		:= 535487cc041f2db746587cf40a2059f0
> +DMIDECODE		:= dmidecode-$(DMIDECODE_VERSION)
> +DMIDECODE_SUFFIX	:= tar.bz2
> +DMIDECODE_URL		:= http://savannah.nongnu.org/download/dmidecode//$(DMIDECODE).$(DMIDECODE_SUFFIX)
> +DMIDECODE_SOURCE	:= $(SRCDIR)/$(DMIDECODE).$(DMIDECODE_SUFFIX)
> +DMIDECODE_DIR		:= $(BUILDDIR)/$(DMIDECODE)
> +DMIDECODE_LICENSE	:= GPLv2
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +DMIDECODE_CONF_ENV	:= $(CROSS_ENV)

remove, and add:

DMIDECODE_CONF_TOOL	:= NO

> +DMIDECODE_MAKE_ENV	:= $(CROSS_ENV)
> +DMIDECODE_MAKEVARS := \

DMIDECODE_MAKE_OPT	:= \

> +	PREFIX=/usr \

if you use "prefix=/usr" the the patch is not needed.

And you might want do define 'MACHINE' somewhere. Otherwise some stuff is
compiled depending on the host.

Michael

> +	CC=$(CROSS_CC) \
> +	CFLAGS="$(CROSS_CPPFLAGS)"
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/dmidecode.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, dmidecode)
> +	@$(call install_fixup, dmidecode,PRIORITY,optional)
> +	@$(call install_fixup, dmidecode,SECTION,base)
> +	@$(call install_fixup, dmidecode,AUTHOR,"Alexander Stein <alexander.stein@systec-electronic.com>")
> +	@$(call install_fixup, dmidecode,DESCRIPTION,missing)
> +
> +	@$(call install_copy, dmidecode, 0, 0, 0755, -, /usr/sbin/dmidecode)
> +
> +	@$(call install_finish, dmidecode)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 1.7.8.6
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de