This adds a variant check to run InstallDev only when the first variant
is built. Otherwise, a dependent package may install the default
version, even though the second variant ends up in the staging dir,
causing downstream packages to miss library dependencies, such as:
Package rtorrent-rpc is missing dependencies for the following libraries:
libxmlrpc_xmlparse.so.3
libxmlrpc_xmltok.so.3
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Remove xmlrpc-c Package definition and let both xmlrpc-c-internal
and xmlrpc-c-libxml2 provide xmlrpc-c.
Also add a patch removing the unnecessary linking.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
When building abyss feature, the following error occurs:
xmlrpc_server_abyss.c:783:13: warning: format not a string literal and
no format arguments [-Wformat-security]
783 | xmlrpc_faultf(envP, error);
Add a patch fixing the format parameter.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
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>
The crude loop I wrote to come up with this changeset:
find -L package/feeds/packages/ -name patches | \
sed 's/patches$/refresh/' | sort | xargs make
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
This removes lines that set PKG_BUILD_DIR when the set value is no
different from the default value.
Specifically, the line is removed if the assigned value is:
* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
The default PKG_BUILD_DIR was updated[1] to incorporate BUILD_VARIANT
if it is set, so now this is identical to the default value.
* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
if PKG_SOURCE_SUBDIR is set to $(PKG_NAME)-$(PKG_VERSION), making it
the same as the previous case
* $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
This is the same as the default PKG_BUILD_DIR when there is no
BUILD_VARIANT.
* $(BUILD_DIR)/[name]-$(PKG_VERSION)
where [name] is a string that is identical to PKG_NAME
[1]: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=e545fac8d968864a965edb9e50c6f90940b0a6c9
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Small Makefile reorganization.
Switch BUILD_PARALLEL to 1. Seems to work now.
Added nanosleep patch that replaces usleep usage.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Eneas U de Queiroz