diff --git a/package/confd/confd.mk b/package/confd/confd.mk index 8ab99702..063b1962 100644 --- a/package/confd/confd.mk +++ b/package/confd/confd.mk @@ -70,22 +70,34 @@ define CONFD_INSTALL_YANG_MODULES_CONTAINERS endef endif -define CONFD_PERMISSIONS - /etc/sysrepo/data/ r 660 root sys-cli - - - - - - /etc/sysrepo/data d 770 root sys-cli - - - - - +# PER_PACKAGE_DIR +# Since the last package in the dependency chain that runs sysrepoctl is confd, we need to +# manually copy the *real* content here from host-sysrepo. +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define CONFD_INSTALL_IN_ROMFS + cp -a $(PER_PACKAGE_DIR)/host-sysrepo/target/etc/sysrepo/* $(PER_PACKAGE_DIR)/confd/target/etc/sysrepo/ endef +endif +# PER_PACKAGE_DIR +# Need to do some special stuff if using per-packet (parallel) since sysrepo install the submodules in +# $(PER_PACKAGE_DIR)/host-sysrepo/target/etc/sysrepo/ but $(PER_PACKAGE_DIR)/confd/target/etc/sysrepo/ contains remains +# of other packets that have installed its models (netopeer2), we want the result in $(PER_PACKAGE_DIR)/host-sysrepo/target/etc/sysrepo/ define CONFD_EMPTY_SYSREPO - rm -rf $(TARGET_DIR)/etc/sysrepo/data/ + rm -rf $(TARGET_DIR)/etc/sysrepo/* + if [ "$(BR2_PER_PACKAGE_DIRECTORIES)" = "y" ]; then \ + rm -rf $(PER_PACKAGE_DIR)/host-sysrepo/target/etc/sysrepo/* $(PER_PACKAGE_DIR)/confd/target/etc/sysrepo/*; \ + fi endef define CONFD_CLEANUP rm -f /dev/shm/$(CONFD_SYSREPO_SHM_PREFIX)* endef -CONFD_PRE_INSTALL_TARGET_HOOKS += CONFD_EMPTY_SYSREPO -CONFD_PRE_INSTALL_TARGET_HOOKS += CONFD_CLEANUP +CONFD_PRE_BUILD_HOOKS += CONFD_EMPTY_SYSREPO +CONFD_PRE_BUILD_HOOKS += CONFD_CLEANUP CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES_CONTAINERS -CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_CLEANUP +CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_IN_ROMFS +CONFD_TARGET_FINALIZE_HOOKS += CONFD_CLEANUP $(eval $(autotools-package)) diff --git a/package/landing/landing.mk b/package/landing/landing.mk index 92de7142..6a18d67c 100644 --- a/package/landing/landing.mk +++ b/package/landing/landing.mk @@ -11,6 +11,7 @@ LANDING_LICENSE = ISC LANDING_LICENSE_FILES = LICENSE define LANDING_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/usr/html/ cp $(@D)/*.html $(TARGET_DIR)/usr/html/ cp $(@D)/*.png $(TARGET_DIR)/usr/html/ endef diff --git a/package/lowdown/fix-build.patch b/package/lowdown/fix-build.patch new file mode 100644 index 00000000..2fdd513e --- /dev/null +++ b/package/lowdown/fix-build.patch @@ -0,0 +1,27 @@ +diff -urN lowdown-VERSION_1_0_2.orig/configure lowdown-VERSION_1_0_2/configure +--- lowdown-VERSION_1_0_2.orig/configure 2025-03-21 12:58:06.151106271 +0000 ++++ lowdown-VERSION_1_0_2/configure 2025-03-21 13:20:20.649825864 +0000 +@@ -61,12 +61,7 @@ + + MAKE_FLAGS="" + +-if [ -n "${MAKELEVEL}" ]; then +- if [ "${MAKELEVEL}" -gt 0 ] ; then +- MAKE_FLAGS="--no-print-directory" +- echo "all:" | make ${MAKE_FLAGS} -sf - 2>/dev/null || MAKE_FLAGS="" +- fi +-fi ++MAKE_FLAGS="--no-print-directory" + + if [ -n "$MAKE_FLAGS" ]; then + echo "GNU submake detected: using --no-print-directory" 1>&2 +@@ -79,9 +74,6 @@ + # in. + #---------------------------------------------------------------------- + +-AR=`printf "all:\\n\\t@echo \\\$(AR)\\n" | make ${MAKE_FLAGS} -sf -` +-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make ${MAKE_FLAGS} -sf -` +-CFLAGS=`printf "all:\\n\\t@echo \\\$(CFLAGS)\\n" | make ${MAKE_FLAGS} -sf -` + CFLAGS="${CFLAGS} -g -W -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes" + CFLAGS="${CFLAGS} -Wwrite-strings -Wno-unused-parameter" + LDLIBS= diff --git a/package/nghttp2-asio/nghttp2-asio.mk b/package/nghttp2-asio/nghttp2-asio.mk index 621d98e4..410fb493 100644 --- a/package/nghttp2-asio/nghttp2-asio.mk +++ b/package/nghttp2-asio/nghttp2-asio.mk @@ -9,7 +9,7 @@ NGHTTP2_ASIO_SITE = https://github.com/kernelkit/nghttp2-asio.git NGHTTP2_ASIO_SITE_METHOD = git NGHTTP2_ASIO_LICENSE = MIT NGHTTP2_ASIO_LICENSE_FILES = COPYING -NGHTTP2_ASIO_DEPENDENCIES = boost nghttp2 +NGHTTP2_ASIO_DEPENDENCIES = boost nghttp2 openssl NGHTTP2_ASIO_INSTALL_STAGING = YES NGHTTP2_ASIO_AUTOGEN = YES NGHTTP2_ASIO_AUTORECONF = YES diff --git a/package/python-libyang/python-libyang.mk b/package/python-libyang/python-libyang.mk index 618098a8..e8cca429 100644 --- a/package/python-libyang/python-libyang.mk +++ b/package/python-libyang/python-libyang.mk @@ -10,8 +10,8 @@ PYTHON_LIBYANG_SITE = https://files.pythonhosted.org/packages/91/2e/ff13ee16c874 PYTHON_LIBYANG_SETUP_TYPE = setuptools PYTHON_LIBYANG_LICENSE = MIT PYTHON_LIBYANG_LICENSE_FILES = LICENSE -PYTHON_LIBYANG_DEPENDENCIES = python-cython python-cffi -HOST_PYTHON_LIBYANG_DEPENDENCIES = host-python-cython host-python-cffi +PYTHON_LIBYANG_DEPENDENCIES = python-cython python-cffi libyang +HOST_PYTHON_LIBYANG_DEPENDENCIES = host-python-cython host-python-cffi host-libyang $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/src/confd/yang/sysrepo.inc b/src/confd/yang/sysrepo.inc index 1fcbf1b7..7728fedf 100644 --- a/src/confd/yang/sysrepo.inc +++ b/src/confd/yang/sysrepo.inc @@ -3,7 +3,7 @@ MODULES=( "sysrepo@2024-10-25.yang" - "sysrepo-factory-default@2024-05-02.yang" + "sysrepo-factory-default@2025-03-18.yang" "sysrepo-monitoring@2023-08-11.yang" "sysrepo-notifications@2025-01-10.yang" "sysrepo-plugind@2022-08-26.yang" @@ -15,11 +15,8 @@ MODULES=( "ietf-netconf-notifications@2012-02-06.yang" "ietf-netconf-with-defaults@2011-06-01.yang" "ietf-origin@2018-02-14.yang" - "ietf-yang-library@2016-06-21.yang" "ietf-yang-library@2019-01-04.yang" - - "iana-if-type@2014-05-08.yang" "ietf-interfaces@2018-02-20.yang" "ietf-ip@2018-02-22.yang" "ietf-network-instance@2019-01-21.yang"