xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-13 23:00:22 +00:00
Code Issues Releases Wiki Activity

Use lowercase file name xcat-core.repo instead of xCAT-core.repo (#5010)

Browse Source 
* Use lowercase file name xcat-core.repo instead of xCAT-core.repo

* Rename xCAT-core.repo to xCAT-core.repo.nouse if it exists

* Change xCAT-dep.repo mentioned in document to xcat-dep.repo
This commit is contained in:
Gᴏɴɢ Jie
2018-03-30 16:03:10 +08:00
committed by Bin Xu
parent 876b41d5d9
commit 2e5815e7fe
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
buildcore.sh
View File

@@ -500,8 +500,8 @@ if [ "$OSNAME" != "AIX" ]; then
# Always recreate it, in case the whole dir was copied from devel to 2.x
if [ -n "$1" ]; then embed="$1/"
else embed=""; fi
cat >xCAT-core.repo << EOF
[xcat-2-core]
cat >xcat-core.repo << EOF
[xcat-core]
name=xCAT 2 Core packages
baseurl=$YUMREPOURL/$REL$EMBEDDIR/$CORE
enabled=1
@@ -514,8 +514,8 @@ EOF
cat >mklocalrepo.sh << 'EOF2'
#!/bin/sh
cd `dirname $0`
REPOFILE=`basename xCAT-*.repo`
if [[ $REPOFILE == "xCAT-*.repo" ]]; then
REPOFILE=`basename xcat-*.repo`
if [[ $REPOFILE == "xcat-*.repo" ]]; then
echo "ERROR: For xcat-dep, please execute $0 in the correct <os>/<arch> subdirectory"
exit 1
fi
@@ -527,6 +527,9 @@ if [ ! -d "$DIRECTORY" ]; then
DIRECTORY="/etc/zypp/repos.d"
fi
sed -e 's|baseurl=.*|baseurl=file://'"`pwd`"'|' $REPOFILE | sed -e 's|gpgkey=.*|gpgkey=file://'"`pwd`"'/repodata/repomd.xml.key|' > "$DIRECTORY/$REPOFILE"
if [ -f "$DIRECTORY/xCAT-core.repo" ]; then
mv "$DIRECTORY/xCAT-core.repo" "$DIRECTORY/xCAT-core.repo.nouse"
fi
cd -
EOF2
chmod 775 mklocalrepo.sh

6
builddep.sh
View File

@@ -125,8 +125,8 @@ if [ "$OSNAME" != "AIX" ]; then
fi
done
# Modify xCAT-dep.repo files to point to the correct place
echo "===> Modifying the xCAT-dep.repo files to point to the correct location..."
# Modify xcat-dep.repo files to point to the correct place
echo "===> Modifying the xcat-dep.repo files to point to the correct location..."
# 10/01/2015 - vkhu
# The URLs have been updated in GSA, this section is not needed at the moment
#
@@ -138,7 +138,7 @@ if [ "$OSNAME" != "AIX" ]; then
# oldurl="$YUMREPOURL2"
#fi
#
#sed -i -e "s|=$oldurl|=$newurl|g" `find . -name "xCAT-dep.repo" `
#sed -i -e "s|=$oldurl|=$newurl|g" `find . -name "xcat-dep.repo" `
fi
if [ "$OSNAME" == "AIX" ]; then

10
buildlocal.sh
View File

@@ -144,19 +144,19 @@ echo "This is an $OSNAME system"
grep -i 'Red' /etc/*release*;
if [ "$OSNAME" != "AIX" -a $? -eq 0 ]; then
cat >$CURDIR/build/xCAT-core.repo << EOF
[xcat-2-core]
cat >$CURDIR/build/xcat-core.repo << EOF
[xcat-core]
name=xCAT 2 Core packages
baseurl=file://$CURDIR/build
enabled=1
gpgcheck=0
EOF
cp $CURDIR/build/xCAT-core.repo /etc/yum.repos.d/
cp $CURDIR/build/xcat-core.repo /etc/yum.repos.d/
createrepo $CURDIR/build
else
rm -f /etc/zypp/repos.d/xCAT-core.repo
zypper ar file://$CURDIR/build xCAT-core
rm -f /etc/zypp/repos.d/xcat-core.repo
zypper ar file://$CURDIR/build xcat-core
fi
fi

4
docs/source/guides/install-guides/yum/configure_xcat.rst
View File

@@ -8,11 +8,11 @@ Internet Repository
**[xcat-core]**
For the xCAT build you want to install, download the ``xCAT-core.repo`` file and copy to ``/etc/yum.repos.d``
For the xCAT build you want to install, download the ``xcat-core.repo`` file and copy to ``/etc/yum.repos.d``
**[xcat-dep]**
From the `xCAT-dep Online Repository <http://xcat.org/files/xcat/repos/yum/xcat-dep/>`_, navigate to the correct subdirectory for the target machine and download the ``xCAT-dep.repo`` file and copy to ``/etc/yum.repos.d``.
From the `xCAT-dep Online Repository <http://xcat.org/files/xcat/repos/yum/xcat-dep/>`_, navigate to the correct subdirectory for the target machine and download the ``xcat-dep.repo`` file and copy to ``/etc/yum.repos.d``.
If using internet repositories, continue to the next step to install xCAT.

4
docs/source/guides/install-guides/zypper/configure_xcat.rst
View File

@@ -8,11 +8,11 @@ Internet Repository
**[xcat-core]**
For the xCAT build you want to install, download the ``xCAT-core.repo`` file and copy to ``/etc/zypp/repos.d``
For the xCAT build you want to install, download the ``xcat-core.repo`` file and copy to ``/etc/zypp/repos.d``
**[xcat-dep]**
From the `xCAT-dep Online Repository <http://xcat.org/files/xcat/repos/yum/xcat-dep/>`_, navigate to the correct subdirectory for the target machine and download the ``xCAT-dep.repo`` file and copy to ``/etc/zypp/repos.d``.
From the `xCAT-dep Online Repository <http://xcat.org/files/xcat/repos/yum/xcat-dep/>`_, navigate to the correct subdirectory for the target machine and download the ``xcat-dep.repo`` file and copy to ``/etc/zypp/repos.d``.
If using internet repositories, continue to the next step to install xCAT.