mirror of
https://github.com/Telecominfraproject/OpenNetworkLinux.git
synced 2026-01-27 10:22:15 +00:00
- Move version files to versions directory.
- Remove ENV_JSON option in favor of explicit includes in necessary packages files.
This commit is contained in:
@@ -23,10 +23,7 @@ export PATH="$ONL/tools/scripts:$ONL/tools:$PATH"
|
||||
export ONL_MAKE_PARALLEL=-j16
|
||||
|
||||
# Version files
|
||||
$ONL/tools/make-versions.py --import-file=$ONL/tools/onlvi --class-name=OnlVersionImplementation --output-dir $ONL/make
|
||||
|
||||
# Make version values available in the package environment
|
||||
export ONLPM_OPTION_INCLUDE_ENV_JSON="$ONL/make/version-onl.json"
|
||||
$ONL/tools/make-versions.py --import-file=$ONL/tools/onlvi --class-name=OnlVersionImplementation --output-dir $ONL/make/versions
|
||||
|
||||
#
|
||||
# buildroot download mirror. We suggest you setup a local repository containing these contents for faster local builds.
|
||||
@@ -41,6 +38,6 @@ $ONL/tools/submodules.py $ONL sm/bigcode
|
||||
export ONL_DEBIAN_SUITE=$(lsb_release -c -s)
|
||||
|
||||
# Enable local post-merge githook
|
||||
if [ ! -f $ONL/.git/hooks/post-merge ]; then
|
||||
if [ ! -f $ONL/.git/hooks/post-merge ] && [ -d $ONL/.git ]; then
|
||||
cp $ONL/tools/scripts/post-merge.hook $ONL/.git/hooks/post-merge
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user