* [Buildroot] [PATCH] inadyn: bump to version 1.99.11
@ 2014-10-16 16:25 Gustavo Zacarias
2014-10-16 16:54 ` Thomas Petazzoni
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo Zacarias @ 2014-10-16 16:25 UTC (permalink / raw)
To: buildroot
Update initscript for the /usr/sbin -> /usr/bin change which is the
default installation directory now that it's using autotools infra.
Also add hash file.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/inadyn/S70inadyn | 10 ++++++----
package/inadyn/inadyn.hash | 2 ++
package/inadyn/inadyn.mk | 26 ++++++++++++--------------
3 files changed, 20 insertions(+), 18 deletions(-)
create mode 100644 package/inadyn/inadyn.hash
diff --git a/package/inadyn/S70inadyn b/package/inadyn/S70inadyn
index 24d0813..02a4c0d 100644
--- a/package/inadyn/S70inadyn
+++ b/package/inadyn/S70inadyn
@@ -14,12 +14,14 @@ VR_INADYN=/var/run/inadyn
case "$1" in
start)
- echo "Starting inadyn."
- start-stop-daemon -S -x /usr/sbin/inadyn
+ echo "Starting inadyn: "
+ start-stop-daemon -S -x /usr/bin/inadyn
+ [ $? == 0 ] && echo "OK" || echo "FAIL"
;;
stop)
- echo "Stopping inadyn."
- start-stop-daemon -q -K -x /usr/sbin/inadyn
+ echo "Stopping inadyn: "
+ start-stop-daemon -q -K -x /usr/bin/inadyn
+ [ $? == 0 ] && echo "OK" || echo "FAIL"
rm -f /var/run/inadyn/inadyn.pid
;;
restart)
diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash
new file mode 100644
index 0000000..e69feb2
--- /dev/null
+++ b/package/inadyn/inadyn.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 7e2bfc5df32848abd814548c87bf1d2731ffcf34ad180d8204d94239cb7ad590 inadyn-1.99.11.tar.gz
diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index 21e983e..74bb679 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -4,33 +4,31 @@
#
################################################################################
-INADYN_VERSION = 1.99.9
+INADYN_VERSION = 1.99.11
INADYN_SITE = $(call github,troglobit,inadyn,$(INADYN_VERSION))
INADYN_LICENSE = GPLv2+
INADYN_LICENSE_FILES = COPYING LICENSE
ifeq ($(BR2_PACKAGE_OPENSSL),y)
+INADYN_CONF_OPTS += --enable-openssl
INADYN_DEPENDENCIES += openssl
+else ifeq ($(BR2_PACKAGE_GNUTLS),y)
+INADYN_DEPENDENCIES += gnutls
else
-define INADYN_DISABLE_OPENSSL
- $(SED) '/ssl/Id' $(@D)/config.mk
-endef
+INADYN_CONF_OPTS += --disable-ssl
endif
-INADYN_POST_PATCH_HOOKS += INADYN_DISABLE_OPENSSL
-
-define INADYN_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
-endef
-define INADYN_INSTALL_TARGET_CMDS
- $(INSTALL) -D -m 0755 $(@D)/src/inadyn $(TARGET_DIR)/usr/sbin/inadyn
- $(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \
- $(TARGET_DIR)/etc/inadyn.conf
+define INADYN_INSTALL_SAMPLE_CONFIG
+ @if [ ! -f $(TARGET_DIR)/etc/inadyn.conf ]; then \
+ $(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \
+ $(TARGET_DIR)/etc/inadyn.conf; \
+ fi
endef
+INADYN_POST_INSTALL_TARGET_HOOKS += INADYN_INSTALL_SAMPLE_CONFIG
define INADYN_INSTALL_INIT_SYSV
$(INSTALL) -D -m 0755 package/inadyn/S70inadyn \
$(TARGET_DIR)/etc/init.d/S70inadyn
endef
-$(eval $(generic-package))
+$(eval $(autotools-package))
--
2.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] inadyn: bump to version 1.99.11
2014-10-16 16:25 [Buildroot] [PATCH] inadyn: bump to version 1.99.11 Gustavo Zacarias
@ 2014-10-16 16:54 ` Thomas Petazzoni
2014-10-16 16:59 ` Gustavo Zacarias
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2014-10-16 16:54 UTC (permalink / raw)
To: buildroot
Dear Gustavo Zacarias,
On Thu, 16 Oct 2014 13:25:33 -0300, Gustavo Zacarias wrote:
> Update initscript for the /usr/sbin -> /usr/bin change which is the
> default installation directory now that it's using autotools infra.
> Also add hash file.
And make the installation of the default config file conditional.
> case "$1" in
> start)
> - echo "Starting inadyn."
> - start-stop-daemon -S -x /usr/sbin/inadyn
> + echo "Starting inadyn: "
> + start-stop-daemon -S -x /usr/bin/inadyn
> + [ $? == 0 ] && echo "OK" || echo "FAIL"
> ;;
> stop)
> - echo "Stopping inadyn."
> - start-stop-daemon -q -K -x /usr/sbin/inadyn
> + echo "Stopping inadyn: "
> + start-stop-daemon -q -K -x /usr/bin/inadyn
> + [ $? == 0 ] && echo "OK" || echo "FAIL"
There's a mix of tabs and spaces being used in the added lines.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] inadyn: bump to version 1.99.11
2014-10-16 16:54 ` Thomas Petazzoni
@ 2014-10-16 16:59 ` Gustavo Zacarias
0 siblings, 0 replies; 3+ messages in thread
From: Gustavo Zacarias @ 2014-10-16 16:59 UTC (permalink / raw)
To: buildroot
On 10/16/2014 01:54 PM, Thomas Petazzoni wrote:
> There's a mix of tabs and spaces being used in the added lines.
I normally do tabs and my added lines do that, didn't see there were
spaces in there before, i'll convert everything to tabs.
Regards.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-16 16:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-16 16:25 [Buildroot] [PATCH] inadyn: bump to version 1.99.11 Gustavo Zacarias
2014-10-16 16:54 ` Thomas Petazzoni
2014-10-16 16:59 ` Gustavo Zacarias
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox