diff options
| -rw-r--r-- | rules/avahi.make | 6 | ||||
| -rw-r--r-- | rules/haserl.make | 2 | ||||
| -rw-r--r-- | rules/templates/template-src-autoconf-make | 4 | ||||
| -rw-r--r-- | rules/templates/template-src-stellaris-make | 6 |
4 files changed, 13 insertions, 5 deletions
diff --git a/rules/avahi.make b/rules/avahi.make index 51d95133f..5d9a88b7f 100644 --- a/rules/avahi.make +++ b/rules/avahi.make @@ -79,7 +79,7 @@ AVAHI_AUTOCONF := \ ifdef PTXCONF_AVAHI_DAEMON AVAHI_AUTOCONF += \ --with-avahi-user=$(PTXCONF_AVAHI_USER) \ - --with-avahi-group=$(PTXCONF_AVAHI_USER) + --with-avahi-group=$(PTXCONF_AVAHI_GROUP) endif ifdef PTXCONF_AVAHI_AUTOIP @@ -182,14 +182,14 @@ ifdef PTXCONF_AVAHI_DAEMON @$(call install_link, avahi, ../init.d/avahi-daemon, /etc/rc.d/S35avahi-daemon) endif -ifdef AVAHI_SERVICES +ifdef PTXCONF_AVAHI_SERVICES # avahi service descriptions # depends on avahi-daemon @$(call install_copy, avahi, 0, 0, 0644, -, /etc/avahi/services/sftp-ssh.service) @$(call install_copy, avahi, 0, 0, 0644, -, /etc/avahi/services/ssh.service) endif -ifdef AVAHI_DNSCONFD +ifdef PTXCONF_AVAHI_DNSCONFD # avahi dnsconfd (Unicast DNS server from mDNS/DNS-SD configuration daemon) # depends on avahi-daemon @$(call install_copy, avahi, 0, 0, 0755, -, /usr/sbin/avahi-dnsconfd) diff --git a/rules/haserl.make b/rules/haserl.make index f85dac25c..ad02526ce 100644 --- a/rules/haserl.make +++ b/rules/haserl.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_HASERL) += haserl # # Paths and names # -HASERL_VERSION := 0.9.21 +HASERL_VERSION := 0.9.26 HASERL := haserl-$(HASERL_VERSION) HASERL_SUFFIX := tar.gz HASERL_URL := $(PTXCONF_SETUP_SFMIRROR)/haserl/$(HASERL).$(HASERL_SUFFIX) diff --git a/rules/templates/template-src-autoconf-make b/rules/templates/template-src-autoconf-make index 3ba3df482..c8081fd34 100644 --- a/rules/templates/template-src-autoconf-make +++ b/rules/templates/template-src-autoconf-make @@ -27,6 +27,10 @@ PACKAGES-$(PTXCONF_@PACKAGE@) += @package@ # Extract # ---------------------------------------------------------------------------- +ifdef PTXCONF_@PACKAGE@_TRUNK +$(STATEDIR)/@package@.extract: $(STATEDIR)/autogen-tools +endif + $(STATEDIR)/@package@.extract: @$(call targetinfo) @$(call clean, $(@PACKAGE@_DIR)) diff --git a/rules/templates/template-src-stellaris-make b/rules/templates/template-src-stellaris-make index 4a63dd42b..7ea8ada86 100644 --- a/rules/templates/template-src-stellaris-make +++ b/rules/templates/template-src-stellaris-make @@ -42,6 +42,10 @@ endif # Extract # ---------------------------------------------------------------------------- +ifdef PTXCONF_@PACKAGE@_TRUNK +$(STATEDIR)/@package@.extract: $(STATEDIR)/autogen-tools +endif + $(STATEDIR)/@package@.extract: @$(call targetinfo) @$(call clean, $(@PACKAGE@_DIR)) @@ -64,7 +68,7 @@ endif # @PACKAGE@_CONF_ENV := CC=$(PTXCONF_STELLARIS_CC) @PACKAGE@_CONF_TOOL := autoconf -@PACKAGE@_CONF_OPT := \ +@PACKAGE@_CONF_OPT = \ --host=$(PTXCONF_STELLARIS_GNU_TARGET) \ --build=$(GNU_HOST) \ --with-stellaris-sdk=$(SW_EK_LM3S3748_DIR) \ |