Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --cc .gitlab-ci.yml
Simple merge

diff --cc DEVELOPERS
index f9b6a0e7d76d769a101bf851d78f4b379a4353c5,f1929272255d74637af63655cc07ea0963d4b1b0..bff5a58a5b3c98680bd32dab62c16f84bb8128dd
--- 1/DEVELOPERS
--- 2/DEVELOPERS
+++ b/DEVELOPERS
@@@ -49,11 -49,9 +49,12 @@@ F:  package/libressl
  F:    package/libselinux/
  F:    package/libsemanage/
  F:    package/libsepol/
 +F:    package/libwebsockets/
  F:    package/nginx-naxsi/
+ F:    package/openjdk-bin/
 +F:    package/php/
  F:    package/policycoreutils/
 +F:    package/python3/
  F:    package/python-flask-sqlalchemy/
  F:    package/python-mutagen/
  F:    package/python-pip/

diff --cc package/ipmiutil/ipmiutil.mk
Simple merge

diff --cc package/libcpprestsdk/libcpprestsdk.mk
index a03e6d250b250042baffb76af2a44fc4fb2b52d1,6f5fb41999f07bd3ded7c73e6e42ab1a99f91793..d527aaad98046dd254b9d0014d3afc8889faada8
--- 1/package/libcpprestsdk/libcpprestsdk.mk
--- 2/package/libcpprestsdk/libcpprestsdk.mk
+++ b/package/libcpprestsdk/libcpprestsdk.mk
@@@ -10,10 -10,13 +10,17 @@@ LIBCPPRESTSDK_LICENSE = MI
  LIBCPPRESTSDK_LICENSE_FILES = license.txt
  LIBCPPRESTSDK_SUBDIR = Release
  LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib
- LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON -DBUILD_SAMPLES=OFF
 -LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF
++LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DBUILD_SAMPLES=OFF
 +
 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 +LIBCPPRESTSDK_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
 +endif
  
+ ifeq ($(BR2_PACKAGE_WEBSOCKETPP),y)
+ LIBCPPRESTSDK_DEPENDENCIES += websocketpp
+ LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_WEBSOCKETS=OFF
+ else
+ LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_WEBSOCKETS=ON
+ endif
+ 
  $(eval $(cmake-package))

diff --cc package/zbar/zbar.mk
Simple merge