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>
This partially reverts ac5912e9cb.
CMAKE_SKIP_RPATH=TRUE is set in include/cmake.mk, so the commit removed
this from some packages as it is the default anyway. But in
mjpg-streamer Makefile this was not set to "TRUE", but to "FALSE". So
this line shouldn't have been removed.
With this revert the runpath is back and modules can be loaded again
from "/usr/lib/mjpg-streamer":
readelf -d build_dir/target-mips_24kc_musl/mjpg-streamer-1.0.0/ipkg-mips_24kc/mjpg-streamer/usr/bin/mjpg_streamer
Dynamic section at offset 0x1c0 contains 35 entries:
Tag Type Name/Value
0x00000001 (NEEDED) Shared library: [libjpeg.so.62]
0x00000001 (NEEDED) Shared library: [libgcc_s.so.1]
0x00000001 (NEEDED) Shared library: [libc.so]
0x0000001d (RUNPATH) Library runpath: [/usr/lib/mjpg-streamer]
Resolve#17081
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Switch to AUTORELEASE for simplicity.
Switch to building with Ninja for faster compilation.
Modify PKG_UNPACK instead of overriding Build/Prepare.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Instead of selecting the modules on compile time, package them into
several small packages. While at it, add the ZeroMQ output plugin which
was previously not packaged.
Also make sure to use OpenWrt's built-in support for CMake properly by
calling Build/Configure/Default in the package's Build/Configure rule.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
input_uvc was broken with new kernel update
patch source: https://github.com/oliv3r/mjpg-streamer
Tested on ar71xx with Logitech C170
Signed-off-by: Mantas Pucka <mantas@8devices.com>
Add options for using libv4l (controls) and installing additional plugins
Download and use latest cambozola.jar if Web UI selected
Signed-off-by: Ted Hess <thess@kitschensync.net>
