Automatically compute and substitute current values for all
$(AUTORELEASE) instances as this feature is deprecated and shouldn't be
used.
The following temporary change was made to the core:
diff --git a/rules.mk b/rules.mk
index 57d7995d4fa8..f16367de87a8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -429,7 +429,7 @@ endef
abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1))))
COMMITCOUNT = $(if $(DUMP),0,$(call commitcount))
-AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1))
+AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile))
all:
FORCE: ;
And this command used to fix affected packages:
for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \
sed 's^.*/\([^/]*\)/Makefile^\1^';);
do
make package/$i/download
done
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Fixes compilation when linking statically.
Made URL HTTPS.
Moved description section for consistency between packages.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Maintainer: Alexander Couzens lynxis@fe80.eu
Compile Tested: Snapshot SDK
Run Tested: target - ath79, hardware - gl-ar300m16, package - nodogsplash v3.2.1 and nodogsplash v3.3.1, Openwrt Snapshot.
Description: If a package depends on libmicrohttpd but does not specify which variant,
a recursive dependency error occurs caused by the superfluous CONFLICTS line.
With this change, a package will get the named variant, or default to the
no-ssl variant if only libmicrohttpd is specified.
Signed-off-by: Rob White <rob@blue-wave.net>
Having CONFLICTS for each variant in the other variant causes recursive dependency error, even though the two variants do conflict with each other. This commit removes one of the CONFLICT lines.
Build now completes without error on SDK.
Signed-off-by: Rob White <rob@blue-wave.net>
Maintainer: Alexander Couzens lynxis@fe80.eu
Compile Tested: Snapshot SDK
Run Tested: target - ath79, hardware - gl-ar300m16, package - nodogsplash v3.2.1 and nodogsplash v3.3.1-beta, Openwrt Snapshot.
Description: Fix for issue #8180 and resubmitted PR #8563 - Any package with a dependency on the non-ssl version of libmicrohttpd ends up with the ssl version along with libgcrypt, libgnutls, .. This fix reverts the no-ssl version name from libmicrohttpd back to libmicrohttpd-no-ssl as it was in previous versions.
The two package names will now be libmicrohttpd-no-ssl and libmicrohttpd-ssl.
Signed-off-by: Rob White <rob@blue-wave.net>
Update to 0.9.62
Various cosmetic changes to Makefile
Fix variants and default to no ssl variant
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
OpenWRT/LEDE only understands the PKG_MD5SUM variable, and detects if the
hash is e.g. SHA256 by looking at the length of the hash.
This affects libs/libmicrohttpd, mail/ssmtp and utils/mc.
Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
Depending on both, GnuTLS and OpenSSL doesn't make sense, we should
use either TLS implementation but not both. Use GnuTLS for now and
get rid of OpenSSL dependency by explicitely telling the package's
build-system to do so using CONFIGURE_ARGS.
If future uses of libmicrohttpd require OpenSSL, it probably makes
most sense to build several variants of the package, i.e.
libmicrohttpd-openssl as well as libmicrohttpd-gnutls. As with most
packages making use of any TLS implementation, these are build-time
decissions resulting in conflicting variants of the same package
which cannot be installed simultanously.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Rosen Penev