matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[config]: Add SONIC_CONFIG_MAKE_JOBS (#784)

Browse Source 
* [config]: Add SONIC_CONFIG_MAKE_JOBS

This config option allows user to specify -j value that will be passed
to each package build.

Signed-off-by: marian-pritsak <marianp@mellanox.com>
This commit is contained in:
Marian Pritsak 2017-07-07 15:32:50 +03:00 committed by GitHub
parent 96fe120265
commit 51cab5d4ed
12 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rules/config
View File

@ -16,6 +16,11 @@
# container. # container.
SONIC_CONFIG_BUILD_JOBS = 1 SONIC_CONFIG_BUILD_JOBS = 1
# SONIC_CONFIG_BUILD_JOBS - set number of jobs for number of jobs per package.
# Corresponding -j argument will be passed to make/dpkg commands that build separate packages
# container.
SONIC_CONFIG_MAKE_JOBS = $(shell nproc)
# SONIC_CONFIG_LOG_TO_FILES - print output from execution of rule for each # SONIC_CONFIG_LOG_TO_FILES - print output from execution of rule for each
# target into separate log file under target/log/. # target into separate log file under target/log/.
# Useful when executing parallel build # Useful when executing parallel build

3
slave.mk
View File

@ -71,6 +71,7 @@ override PASSWORD := $(DEFAULT_PASSWORD)
endif endif
MAKEFLAGS += -j $(SONIC_CONFIG_BUILD_JOBS) MAKEFLAGS += -j $(SONIC_CONFIG_BUILD_JOBS)
export SONIC_CONFIG_MAKE_JOBS
############################################################################### ###############################################################################
## Dumping key config attributes associated to current building exercise ## Dumping key config attributes associated to current building exercise
@ -178,7 +179,7 @@ $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS)) : $(DEBS_PATH)/% : .platform $$(a
if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; popd; fi
pushd $($*_SRC_PATH) $(LOG) pushd $($*_SRC_PATH) $(LOG)
[ ! -f ./autogen.sh ] || ./autogen.sh $(LOG) [ ! -f ./autogen.sh ] || ./autogen.sh $(LOG)
dpkg-buildpackage -rfakeroot -b -us -uc $(LOG) dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) $(LOG)
popd $(LOG) popd $(LOG)
# clean up # clean up
if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; popd; fi if [ -f $($*_SRC_PATH).patch/series ]; then pushd $($*_SRC_PATH) && quilt pop -a -f; popd; fi

2
src/hiredis/Makefile
View File

@ -14,7 +14,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
dpkg-source -x hiredis_$(HIREDIS_VERSION_FULL).dsc dpkg-source -x hiredis_$(HIREDIS_VERSION_FULL).dsc
pushd hiredis-$(HIREDIS_VERSION) pushd hiredis-$(HIREDIS_VERSION)
fakeroot debian/rules binary fakeroot debian/rules -j$(SONIC_CONFIG_MAKE_JOBS) binary
popd popd
mv $* $(DERIVED_TARGETS) $(DEST)/ mv $* $(DERIVED_TARGETS) $(DEST)/

2
src/initramfs-tools/Makefile
View File

@ -15,7 +15,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Build the package # Build the package
rm -f debian/*.debhelper.log rm -f debian/*.debhelper.log
dpkg-buildpackage -rfakeroot -b -us -uc dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd
mv $* $(DEST)/ mv $* $(DEST)/

2
src/isc-dhcp/Makefile
View File

@ -20,7 +20,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Build source and Debian packages # Build source and Debian packages
pushd ./isc-dhcp pushd ./isc-dhcp
dpkg-buildpackage -rfakeroot -b -us -uc dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd
# Move the newly-built .deb packages to the destination directory # Move the newly-built .deb packages to the destination directory

2
src/libnl3/Makefile
View File

@ -27,7 +27,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
quilt push quilt push
quilt push quilt push
quilt push quilt push
dpkg-buildpackage -rfakeroot -b -us -uc dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd
mv $(DERIVED_TARGETS) $* $(DEST)/ mv $(DERIVED_TARGETS) $* $(DEST)/

2
src/libteam/Makefile
View File

@ -28,7 +28,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
mv tmp/debian libteam/ mv tmp/debian libteam/
rm -rf tmp rm -rf tmp
pushd ./libteam pushd ./libteam
dpkg-buildpackage -rfakeroot -b -us -uc dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd
mv $(DERIVED_TARGETS) $* $(DEST)/ mv $(DERIVED_TARGETS) $* $(DEST)/

2
src/mpdecimal/Makefile
View File

@ -14,7 +14,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
dpkg-source -x mpdecimal_$(MPDECIMAL_VERSION_FULL).dsc dpkg-source -x mpdecimal_$(MPDECIMAL_VERSION_FULL).dsc
pushd mpdecimal-$(MPDECIMAL_VERSION) pushd mpdecimal-$(MPDECIMAL_VERSION)
dpkg-buildpackage -us -uc -b dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd
mv $* $(DERIVED_TARGETS) $(DEST)/ mv $* $(DERIVED_TARGETS) $(DEST)/

2
src/python3/Makefile
View File

@ -32,7 +32,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
fi fi
done done
dpkg-buildpackage -rfakeroot -us -uc -b dpkg-buildpackage -rfakeroot -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd
cp $(DERIVED_TARGETS) $* $(DEST)/ cp $(DERIVED_TARGETS) $* $(DEST)/

2
src/redis/Makefile
View File

@ -16,7 +16,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
dpkg-source -x redis_$(REDIS_VERSION_FULL).dsc dpkg-source -x redis_$(REDIS_VERSION_FULL).dsc
pushd redis-$(REDIS_VERSION) pushd redis-$(REDIS_VERSION)
DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -us -uc -b DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd
mv $(DERIVED_TARGETS) $* $(DEST)/ mv $(DERIVED_TARGETS) $* $(DEST)/

2
src/snmpd/Makefile
View File

@ -23,7 +23,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
dpkg-source -x net-snmp_$(SNMPD_VERSION_FULL).dsc dpkg-source -x net-snmp_$(SNMPD_VERSION_FULL).dsc
pushd net-snmp-$(SNMPD_VERSION) pushd net-snmp-$(SNMPD_VERSION)
fakeroot debian/rules binary fakeroot debian/rules -j$(SONIC_CONFIG_MAKE_JOBS) binary
popd popd
mv $(DERIVED_TARGETS) $* $(DEST)/ mv $(DERIVED_TARGETS) $* $(DEST)/

2
src/thrift/Makefile
View File

@ -20,7 +20,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
dpkg-source -x thrift_$(THRIFT_VERSION_FULL).dsc dpkg-source -x thrift_$(THRIFT_VERSION_FULL).dsc
pushd thrift-$(THRIFT_VERSION) pushd thrift-$(THRIFT_VERSION)
patch -p1 < ../patch/THRIFT-3577-assertion-failed.patch patch -p1 < ../patch/THRIFT-3577-assertion-failed.patch
DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
popd popd
mv $(DERIVED_TARGETS) $* $(DEST)/ mv $(DERIVED_TARGETS) $* $(DEST)/