diff options
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/Makefile | 3 | ||||
| -rw-r--r-- | build/f_isoroot/f_odlpluginbuild/requirements-deb.txt | 1 | ||||
| -rw-r--r-- | build/f_isoroot/f_repobuild/Makefile | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile index a63cdadf8..4ec7e809b 100644 --- a/build/f_isoroot/f_odlpluginbuild/Makefile +++ b/build/f_isoroot/f_odlpluginbuild/Makefile @@ -32,8 +32,7 @@ release:.odlbuild sudo gem install fpm sudo pip install fuel-plugin-builder git clone -b $(ODL_BRANCH) $(ODL_REPO) - @$(BUILD_BASE)/check_dependencies.sh fuel-plugin-opendaylight/odl_package/ubuntu/dependencies.txt - INCLUDE_DEPENDENCIES=true fpb --debug --build fuel-plugin-opendaylight/ + fpb --debug --build fuel-plugin-opendaylight/ mv fuel-plugin-opendaylight/opendaylight*.rpm . $(REPOINFO) -r . > gitinfo_odlplugin.txt rm -rf fuel-plugin-opendaylight diff --git a/build/f_isoroot/f_odlpluginbuild/requirements-deb.txt b/build/f_isoroot/f_odlpluginbuild/requirements-deb.txt new file mode 100644 index 000000000..f0d06681e --- /dev/null +++ b/build/f_isoroot/f_odlpluginbuild/requirements-deb.txt @@ -0,0 +1 @@ +openjdk-7-jre-headless diff --git a/build/f_isoroot/f_repobuild/Makefile b/build/f_isoroot/f_repobuild/Makefile index d7db2dd90..522722e66 100644 --- a/build/f_isoroot/f_repobuild/Makefile +++ b/build/f_isoroot/f_repobuild/Makefile @@ -11,6 +11,7 @@ SHELL := /bin/bash TOP := $(shell pwd) RSYNC_HOST := $(shell ./select_ubuntu_repo.sh) +DEPENDENCIES_FILE := /etc/fuel-createmirror/requirements-deb.txt .PHONY: all @@ -37,6 +38,8 @@ nailgun: sudo sed -i 's/DOCKER_MODE=true/DOCKER_MODE=false/' /etc/fuel-createmirror/common.cfg sudo sed -i 's/DEBUG="no"/DEBUG="yes"/' /etc/fuel-createmirror/ubuntu.cfg sudo sed -i "s/MIRROR_UBUNTU_HOST=\".*\"/MIRROR_UBUNTU_HOST=\"$(RSYNC_HOST)\"/" /etc/fuel-createmirror/common.cfg + # Add dependencies from plugins. With awk help try add only unique packages. + sudo bash -c 'find ../ -name requirements-deb.txt -print0 | xargs -0 -I% awk '\''NR == FNR {first[$$0];next}; ! ($$0 in first)'\'' "${DEPENDENCIES_FILE}" "%" >> "${DEPENDENCIES_FILE}"' rm -Rf nailgun sudo mkdir -p /var/www sudo su - -c /opt/fuel-createmirror-*/fuel-createmirror |