From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] inadyn: version bump to 1.99.13
Date: Wed, 1 Jul 2015 10:22:12 +0200 [thread overview]
Message-ID: <20150701082212.GI30833@pengutronix.de> (raw)
In-Reply-To: <1435222502-13967-1-git-send-email-oliver.graute@neuhaus.de>
On Thu, Jun 25, 2015 at 10:55:01AM +0200, Oliver Graute wrote:
> this patch bump inadyn version to 1.99.13
>
> * bugfix issue #82: 'No rule to make target CHANGELOG'
> * enable openssl
Then it should select OPRENSSL, right? And that should be optional.
>
> Signed-off-by: Oliver Graute <oliver.graute@neuhaus.de>
> ---
> .../inadyn-1.99.13/0001-ChangeLog_Issue-82.patch | 24 ++++++++++++++++++++
> patches/inadyn-1.99.13/series | 1 +
> rules/inadyn.make | 13 +++++++----
> 3 files changed, 33 insertions(+), 5 deletions(-)
> create mode 100644 patches/inadyn-1.99.13/0001-ChangeLog_Issue-82.patch
> create mode 100644 patches/inadyn-1.99.13/series
>
With a proper patch header please. The best way to add it is with git:
$ mkdir <PTXDIST_DIR>/patches/inadyn-1.99.13
$ ptxdist --git extract inadyn
$ cd platform-*/build-target/inadyn-1.99.13
[... commit the fixes ...]
$ git ptx-patches
> diff --git a/patches/inadyn-1.99.13/0001-ChangeLog_Issue-82.patch b/patches/inadyn-1.99.13/0001-ChangeLog_Issue-82.patch
> new file mode 100644
> index 0000000..fa773d8
> --- /dev/null
> +++ b/patches/inadyn-1.99.13/0001-ChangeLog_Issue-82.patch
> @@ -0,0 +1,24 @@
> +diff -rupN BM/Makefile.am BN/Makefile.am
> +--- BM/Makefile.am 2015-04-27 16:42:12.774690084 +0200
> ++++ BN/Makefile.am 2015-04-27 16:40:22.431277983 +0200
> +@@ -1,7 +1,7 @@
> + ## Inadyn - A small and simple DDNS client -*-Makefile-*-
> +
> + SUBDIRS = src include man
> +-doc_DATA = AUTHORS COPYING NEWS CHANGELOG README
> ++doc_DATA = README AUTHORS COPYING NEWS ChangeLog
> + EXTRA_DIST = autogen.sh
> + DISTCLEANFILES = *~ DEADJOE semantic.cache *.gdb *.elf core core.* *.d
> +
> +diff -rupN BM/Makefile.in BN/Makefile.in
> +--- BM/Makefile.in 2015-04-27 16:42:12.774690084 +0200
> ++++ BN/Makefile.in 2015-04-27 16:35:45.000000000 +0200
> +@@ -248,7 +248,7 @@ top_build_prefix = @top_build_prefix@
> + top_builddir = @top_builddir@
> + top_srcdir = @top_srcdir@
> + SUBDIRS = src include man
> +-doc_DATA = AUTHORS COPYING NEWS CHANGELOG README
> ++doc_DATA = README AUTHORS COPYING NEWS ChangeLog
> + EXTRA_DIST = autogen.sh
> + DISTCLEANFILES = *~ DEADJOE semantic.cache *.gdb *.elf core core.* *.d
> + GPG = gpg
don't patch Makefile.in, create a autogen.sh link in the patch dir (like
many other packages). PTXdist will run it to create Makefile.in etc.
> diff --git a/patches/inadyn-1.99.13/series b/patches/inadyn-1.99.13/series
> new file mode 100644
> index 0000000..71a082a
> --- /dev/null
> +++ b/patches/inadyn-1.99.13/series
> @@ -0,0 +1 @@
> +0001-ChangeLog_Issue-82.patch
> diff --git a/rules/inadyn.make b/rules/inadyn.make
> index df83fca..2ca4b32 100644
> --- a/rules/inadyn.make
> +++ b/rules/inadyn.make
> @@ -18,17 +18,20 @@ PACKAGES-$(PTXCONF_INADYN) += inadyn
> #
> # Paths and names
> #
> -INADYN_VERSION := 1.96.2
> -INADYN_MD5 := fecb4c970811cb0c8b8d2ffcd7792879
> +INADYN_VERSION := 1.99.13
> +INADYN_MD5 := 38f07f98fce75b48ea13d47620176311
> INADYN := inadyn-$(INADYN_VERSION)
> -INADYN_SUFFIX := tar.bz2
> -INADYN_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(INADYN).$(INADYN_SUFFIX)
> +INADYN_SUFFIX := tar.xz
> +INADYN_URL := https://github.com/troglobit/inadyn/releases/download/$(INADYN_VERSION)/inadyn-$(INADYN_VERSION).$(INADYN_SUFFIX)
> INADYN_SOURCE := $(SRCDIR)/$(INADYN).$(INADYN_SUFFIX)
> INADYN_DIR := $(BUILDDIR)/$(INADYN)
>
> # ----------------------------------------------------------------------------
> # Compile
> # ----------------------------------------------------------------------------
this should have a 'Prepare' header, and a INADYN_CONF_TOOL definition
> +INADYN_CONF_OPT := \
> +$(CROSS_AUTOCONF_USR) \
> + --enable-openssl
>
> INADYN_MAKE_ENV := $(CROSS_ENV)
> INADYN_MAKE_OPT := TARGET_ARCH=linux
This uses autotools now, so this is probably not needed any more
> @@ -39,7 +42,7 @@ INADYN_MAKE_OPT := TARGET_ARCH=linux
>
> $(STATEDIR)/inadyn.install:
> @$(call targetinfo)
> - install -D -m755 $(INADYN_DIR)/bin/linux/inadyn \
> + install -D -m755 $(INADYN_DIR)/src/inadyn \
> $(INADYN_PKGDIR)/sbin/inadyn
> @$(call touch)
maybe 'make install' works now, so the install stage is no longer needed?
Michael
>
> --
> 1.7.9.5
>
>
> --
> 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
prev parent reply other threads:[~2015-07-01 6:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-25 8:55 Oliver Graute
2015-07-01 8:22 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150701082212.GI30833@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox