summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorJan Benedikt <j.benedikt@partner.samsung.com>2019-10-25 03:35:51 -0400
committerJan Benedikt <j.benedikt@partner.samsung.com>2019-11-05 08:11:05 -0500
commit5907acf7093ed3c64b418590287db8446f9bac21 (patch)
tree46f5c578a0b5384d7e575b3f5f020b3fd9620033 /build
parent66818b61e314499552a115effa327ad1a1544da3 (diff)
Chaging name of rhel resource directory to rpm
Changing name of rhel resource directory in "resources/pkg" from rhel to rpm due to platfrom independent repository for all distributions supporting RPM packages. Issue-ID: OOM-2150 Change-Id: Ie5425df8b8550c618440586b495907f86c4cc509 Signed-off-by: Jan Benedikt <j.benedikt@partner.samsung.com>
Diffstat (limited to 'build')
-rwxr-xr-xbuild/create_repo.sh6
-rwxr-xr-xbuild/docker-entrypoint.sh4
2 files changed, 5 insertions, 5 deletions
diff --git a/build/create_repo.sh b/build/create_repo.sh
index b6db6ad2..eaf0ee30 100755
--- a/build/create_repo.sh
+++ b/build/create_repo.sh
@@ -12,7 +12,7 @@ container_repo_volume="/mnt/repo/"
# Docker image name and version
docker_image="centos:centos7.6.1810"
# Expected directory for RPM packages
-expected_dir="resources/pkg/rhel"
+expected_dir="resources/pkg/rpm"
help () {
echo "Script for run docker container with RPM repository"
@@ -56,10 +56,10 @@ do
shift;shift
done
-# Check if path contains expected path "resources/pkg/rhel"
+# Check if path contains expected path "resources/pkg/rpm"
if ! [[ "/$volume_repo_directory/" = *"/$expected_dir/"* ]]; then
# Create repo folder if it not exists
- volume_repo_directory="$volume_repo_directory"/resources/pkg/rhel
+ volume_repo_directory="$volume_repo_directory"/resources/pkg/rpm
[ ! -d "$volume_repo_directory" ] && mkdir -p $volume_repo_directory
fi
diff --git a/build/docker-entrypoint.sh b/build/docker-entrypoint.sh
index 1b4ec53c..14f6aaa7 100755
--- a/build/docker-entrypoint.sh
+++ b/build/docker-entrypoint.sh
@@ -14,7 +14,7 @@ help () {
echo -e "-l --list: set path where rpm list is stored in container\n"
echo "Both paths have to be set with shared volume between"
echo "container and host computer. Default path in container is: /tmp/"
- echo "Repository will be created at: /<path>/resources/pkg/rhel/"
+ echo "Repository will be created at: /<path>/resources/pkg/rpm/"
echo "RMP list is stored at: ./data_list/"
}
@@ -52,7 +52,7 @@ do
done
# Testing if directory parametter was used
-# If not variable is sets to default value /tmp/repo/resources/pkg/rhel
+# If not variable is sets to default value /tmp/repo/resources/pkg/rpm
if test -z "$OFFLINE_REPO_DIR"
then
OFFLINE_REPO_DIR="/tmp/repo/"