Skip to content

Commit 6a2abd9

Browse files
mattiaswalmattiaswal
authored
Merge pull request #989 from kernelkit/enable-full-parallel
Enable full parallel
2 parents aa995e3 + 0a74ba3 commit 6a2abd9

File tree

6 files changed

+51
-14
lines changed

6 files changed

+51
-14
lines changed

‎package/confd/confd.mk‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,34 @@ define CONFD_INSTALL_YANG_MODULES_CONTAINERS
7070
endef
7171
endif
7272

73-
define CONFD_PERMISSIONS
74-
/etc/sysrepo/data/ r 660 root sys-cli - - - - -
75-
/etc/sysrepo/data d 770 root sys-cli - - - - -
73+
# PER_PACKAGE_DIR
74+
# Since the last package in the dependency chain that runs sysrepoctl is confd, we need to
75+
# manually copy the *real* content here from host-sysrepo.
76+
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
77+
define CONFD_INSTALL_IN_ROMFS
78+
cp -a $(PER_PACKAGE_DIR)/host-sysrepo/target/etc/sysrepo/* $(PER_PACKAGE_DIR)/confd/target/etc/sysrepo/
7679
endef
80+
endif
7781

82+
# PER_PACKAGE_DIR
83+
# Need to do some special stuff if using per-packet (parallel) since sysrepo install the submodules in
84+
# $(PER_PACKAGE_DIR)/host-sysrepo/target/etc/sysrepo/ but $(PER_PACKAGE_DIR)/confd/target/etc/sysrepo/ contains remains
85+
# of other packets that have installed its models (netopeer2), we want the result in $(PER_PACKAGE_DIR)/host-sysrepo/target/etc/sysrepo/
7886
define CONFD_EMPTY_SYSREPO
79-
rm -rf $(TARGET_DIR)/etc/sysrepo/data/
87+
rm -rf $(TARGET_DIR)/etc/sysrepo/*
88+
if [ "$(BR2_PER_PACKAGE_DIRECTORIES)" = "y" ]; then \
89+
rm -rf $(PER_PACKAGE_DIR)/host-sysrepo/target/etc/sysrepo/* $(PER_PACKAGE_DIR)/confd/target/etc/sysrepo/*; \
90+
fi
8091
endef
8192
define CONFD_CLEANUP
8293
rm -f /dev/shm/$(CONFD_SYSREPO_SHM_PREFIX)*
8394
endef
84-
CONFD_PRE_INSTALL_TARGET_HOOKS += CONFD_EMPTY_SYSREPO
85-
CONFD_PRE_INSTALL_TARGET_HOOKS += CONFD_CLEANUP
95+
CONFD_PRE_BUILD_HOOKS += CONFD_EMPTY_SYSREPO
96+
CONFD_PRE_BUILD_HOOKS += CONFD_CLEANUP
8697
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_EXTRA
8798
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES
8899
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_YANG_MODULES_CONTAINERS
89-
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_CLEANUP
100+
CONFD_POST_INSTALL_TARGET_HOOKS += CONFD_INSTALL_IN_ROMFS
101+
CONFD_TARGET_FINALIZE_HOOKS += CONFD_CLEANUP
90102

91103
$(eval $(autotools-package))

‎package/landing/landing.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ LANDING_LICENSE = ISC
1111
LANDING_LICENSE_FILES = LICENSE
1212

1313
define LANDING_INSTALL_TARGET_CMDS
14+
mkdir -p $(TARGET_DIR)/usr/html/
1415
cp $(@D)/*.html $(TARGET_DIR)/usr/html/
1516
cp $(@D)/*.png $(TARGET_DIR)/usr/html/
1617
endef

‎package/lowdown/fix-build.patch‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff -urN lowdown-VERSION_1_0_2.orig/configure lowdown-VERSION_1_0_2/configure
2+
--- lowdown-VERSION_1_0_2.orig/configure 2025-03-21 12:58:06.151106271 +0000
3+
+++ lowdown-VERSION_1_0_2/configure 2025-03-21 13:20:20.649825864 +0000
4+
@@ -61,12 +61,7 @@
5+
6+
MAKE_FLAGS=""
7+
8+
-if [ -n "${MAKELEVEL}" ]; then
9+
- if [ "${MAKELEVEL}" -gt 0 ] ; then
10+
- MAKE_FLAGS="--no-print-directory"
11+
- echo "all:" | make ${MAKE_FLAGS} -sf - 2>/dev/null || MAKE_FLAGS=""
12+
- fi
13+
-fi
14+
+MAKE_FLAGS="--no-print-directory"
15+
16+
if [ -n "$MAKE_FLAGS" ]; then
17+
echo "GNU submake detected: using --no-print-directory" 1>&2
18+
@@ -79,9 +74,6 @@
19+
# in.
20+
#----------------------------------------------------------------------
21+
22+
-AR=`printf "all:\\n\\t@echo \\\$(AR)\\n" | make ${MAKE_FLAGS} -sf -`
23+
-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make ${MAKE_FLAGS} -sf -`
24+
-CFLAGS=`printf "all:\\n\\t@echo \\\$(CFLAGS)\\n" | make ${MAKE_FLAGS} -sf -`
25+
CFLAGS="${CFLAGS} -g -W -Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes"
26+
CFLAGS="${CFLAGS} -Wwrite-strings -Wno-unused-parameter"
27+
LDLIBS=

‎package/nghttp2-asio/nghttp2-asio.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ NGHTTP2_ASIO_SITE = https://github.com/kernelkit/nghttp2-asio.git
99
NGHTTP2_ASIO_SITE_METHOD = git
1010
NGHTTP2_ASIO_LICENSE = MIT
1111
NGHTTP2_ASIO_LICENSE_FILES = COPYING
12-
NGHTTP2_ASIO_DEPENDENCIES = boost nghttp2
12+
NGHTTP2_ASIO_DEPENDENCIES = boost nghttp2 openssl
1313
NGHTTP2_ASIO_INSTALL_STAGING = YES
1414
NGHTTP2_ASIO_AUTOGEN = YES
1515
NGHTTP2_ASIO_AUTORECONF = YES

‎package/python-libyang/python-libyang.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ PYTHON_LIBYANG_SITE = https://files.pythonhosted.org/packages/91/2e/ff13ee16c874
1010
PYTHON_LIBYANG_SETUP_TYPE = setuptools
1111
PYTHON_LIBYANG_LICENSE = MIT
1212
PYTHON_LIBYANG_LICENSE_FILES = LICENSE
13-
PYTHON_LIBYANG_DEPENDENCIES = python-cython python-cffi
14-
HOST_PYTHON_LIBYANG_DEPENDENCIES = host-python-cython host-python-cffi
13+
PYTHON_LIBYANG_DEPENDENCIES = python-cython python-cffi libyang
14+
HOST_PYTHON_LIBYANG_DEPENDENCIES = host-python-cython host-python-cffi host-libyang
1515

1616
$(eval $(python-package))
1717
$(eval $(host-python-package))

‎src/confd/yang/sysrepo.inc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
MODULES=(
55
"[email protected]"
6-
"sysrepo-factory-default@2024-05-02.yang"
6+
"sysrepo-factory-default@2025-03-18.yang"
77
"[email protected]"
88
"[email protected]"
99
"[email protected]"
@@ -15,11 +15,8 @@ MODULES=(
1515
"[email protected]"
1616
"[email protected]"
1717
"[email protected]"
18-
"[email protected]"
1918
"[email protected]"
2019

21-
22-
"[email protected]"
2320
"[email protected]"
2421
"[email protected]"
2522
"[email protected]"

0 commit comments

Comments
 (0)