On Tue, Jun 01, 2010 at 12:33:21PM +0200, Marc Kleine-Budde wrote:
> Michael Olbrich wrote:
> > On Tue, Jun 01, 2010 at 11:59:04AM +0200, Marc Kleine-Budde wrote:
> >> Tim Sander wrote:
> >>> Hi
> >>>
> >>> This is patch 7290cdbf0d483085f6bacf8be7233406cfb88ce6
> >>> from git://gitorious.org/~tstone/oselas/ptxdist-upstart.git.
> >>>
> >>> Should contain all fixes suggested on this list. The commit
> >>> order in the git repository has been shuffled to fit the suggestions.
> >>>
> >>> Best regards
> >>> Tim
> >>>
> >>> diff --git a/rules/libnih.in b/rules/libnih.in
> >>> new file mode 100644
> >>> index 0000000..d29b415
> >>> --- /dev/null
> >>> +++ b/rules/libnih.in
> >>> @@ -0,0 +1,11 @@
> >>> +## SECTION=system_libraries
> >>> +
> >>> +config LIBNIH
> >>> + bool
> >>> + prompt "libnih"
> >>> + select DBUS
> >>> + select HOST_LIBNIH
> >>> + help
> >>> + libnih is a small library for C application development
> >>> containing
> >>> + functions that, despite its name, are not implemented elsewhere
> >>> in
> >>> + the standard library set.
> >>> diff --git a/rules/libnih.make b/rules/libnih.make
> >>> new file mode 100644
> >>> index 0000000..f40be37
> >>> --- /dev/null
> >>> +++ b/rules/libnih.make
> >>> @@ -0,0 +1,74 @@
> >>> +# -*-makefile-*-
> >>> +#
> >>> +# Copyright (C) 2010 by Tim Sander <tim.san...@hbm.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_LIBNIH) += libnih
> >>> +
> >>> +#
> >>> +# Paths and names
> >>> +#
> >>> +LIBNIH_VERSION := 1.0.2
> >>> +LIBNIH := libnih-$(LIBNIH_VERSION)
> >>> +LIBNIH_SUFFIX := tar.gz
> >>> +LIBNIH_URL :=
> >>> http://launchpad.net/libnih/1.0/$(LIBNIH_VERSION)/+download/$(LIBNIH).$(LIBNIH_SUFFIX)
> >>> +LIBNIH_DIR := $(BUILDDIR)/$(LIBNIH)
> >>> +LIBNIH_SOURCE := $(SRCDIR)/$(LIBNIH).$(LIBNIH_SUFFIX)
> >>> +LIBNIH_LICENSE := GPLv2+
> >> just coding style: please align the := with tabs before them
> >
> > They are aligned. The patch is broken by his mail program.
>
> nope, I just looked at the tim's git tree.
You're right, some lines have spaces.
> >>> +
> >>> +#
> >>> ----------------------------------------------------------------------------
> >>> +# Get
> >>> +#
> >>> ----------------------------------------------------------------------------
> >>> +$(LIBNIH_SOURCE):
> >>> + @$(call targetinfo)
> >>> + @$(call get, LIBNIH)
> >>> +
> >>> +#
> >>> ----------------------------------------------------------------------------
> >>> +# Prepare
> >>> +#
> >>> ----------------------------------------------------------------------------
> >>> +
> >>> +LIBNIH_PATH := PATH=$(CROSS_PATH)
> >>> +LIBNIH_ENV := $(CROSS_ENV)
> >>> NIH_DBUS_TOOL=${PTXDIST_SYSROOT_HOST}/bin/nih-dbus-tool
> >>> +
> >>> +#
> >>> +# autoconf
> >>> +#
> >>> +LIBNIH_AUTOCONF := \
> >>> + $(CROSS_AUTOCONF_USR)
> >>> +
> >>> +#
> >>> ----------------------------------------------------------------------------
> >>> +# Target-Install
> >>> +#
> >>> ----------------------------------------------------------------------------
> >>> +
> >>> +$(STATEDIR)/libnih.targetinstall:
> >>> + @$(call targetinfo)
> >>> +
> >>> + @$(call install_init, libnih)
> >>> + @$(call install_fixup, libnih, PACKAGE, libnih)
> >>> + @$(call install_fixup, libnih, PRIORITY, optional)
> >>> + @$(call install_fixup, libnih, VERSION, 1.0.1)
> >>> + @$(call install_fixup, libnih, SECTION, base)
> >>> + @$(call install_fixup, libnih, AUTHOR, "Tim Sandet
> >>> <tim.san...@hbm.com>")
> >>> + @$(call install_fixup, libnih, DEPENDS,)
> >>> + @$(call install_fixup, libnih, DESCRIPTION, missing)
> >>> +
> >>> +
> >>> + $(call install_copy, libnih, 0, 0, 0644, -,
> >>> /usr/lib/libnih-dbus.so.1.0.0);
> >>> + $(call install_copy, libnih, 0, 0, 0644, -,
> >>> /usr/lib/libnih.so.1.0.0);
> >>> + $(call install_link, libnih, libnih-dbus.so.1.0.0,
> >>> /usr/lib/libnih-dbus.so.1);
> >>> + $(call install_link, libnih, libnih-dbus.so.1.0.0,
> >>> /usr/lib/libnih-dbus.so);
> >>> + $(call install_link, libnih, libnih.so.1.0.0,
> >>> /usr/lib/libnih.so.1);
> >>> + $(call install_link, libnih, libnih.so.1.0.0,
> >>> /usr/lib/libnih.so);
and please remove the trailing white spaces here.
Everything compiled fine here.
Marc: unless you have any other issues I'll merge the tree when these
formating issues are taken care of.
mol
> >>> + @$(call install_finish, libnih)
> >>> +
> >>> + @$(call touch)
> >>> +
> >>> +# vim: syntax=make
> >>>
> >>
> >> --
> >> Pengutronix e.K. | Marc Kleine-Budde |
> >> Industrial Linux Solutions | Phone: +49-231-2826-924 |
> >> Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
> >> Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
> >>
> >
> >
> >
> >> --
> >> ptxdist mailing list
> >> ptxdist@pengutronix.de
> >
> >
>
>
> --
> Pengutronix e.K. | Marc Kleine-Budde |
> Industrial Linux Solutions | Phone: +49-231-2826-924 |
> Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
> Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
>
> --
> 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
