From d9571e3f514e63b4b20764d83a7fc437edb28996 Mon Sep 17 00:00:00 2001 From: Matt Peters Date: Fri, 15 Jun 2018 10:24:36 -0500 Subject: [PATCH] update mirror download repos and instructions Update the mirror download repositories to public mirrors, fix missing packages and update documentation. Change-Id: I7ae92efbcfe21214f267e8d2bc6fe275f4688c0c Signed-off-by: Matt Peters --- centos-mirror-tools/Dockerfile | 1 + centos-mirror-tools/README.md | 13 ++++++------- centos-mirror-tools/StarlingX.repo | 12 ++++++------ centos-mirror-tools/rpms_from_3rd_parties.lst | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/centos-mirror-tools/Dockerfile b/centos-mirror-tools/Dockerfile index ece6feee..a5d2d5d3 100644 --- a/centos-mirror-tools/Dockerfile +++ b/centos-mirror-tools/Dockerfile @@ -19,3 +19,4 @@ COPY rpm-gpg-keys/* /etc/pki/rpm-gpg/ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY* +WORKDIR /localdisk diff --git a/centos-mirror-tools/README.md b/centos-mirror-tools/README.md index 4d0c1f51..4fb46034 100644 --- a/centos-mirror-tools/README.md +++ b/centos-mirror-tools/README.md @@ -1,5 +1,5 @@ -# Create mirror for Akraino +# Create mirror for StarlingX ## Step 0 - Build the container @@ -14,7 +14,7 @@ $ docker build -t : -f Dockerfile . The container shall be run from the same directory where the other scripts are stored. ``` -$ docker run -v $(pwd):/localdisk : bash +$ docker run -it -v $(pwd):/localdisk : bash ``` As `/localdisk` is defined as the workdir of the container, the same folder name should be used to define the volume. The container will start to run and populate a `logs` and `output` folders in this directory. @@ -25,7 +25,6 @@ The container shall be run from the same directory where the other scripts are s Once inside the container run the downloader script ``` -$ cd /localdisk $ ./download_mirror.sh ``` @@ -39,20 +38,20 @@ After all downloading complete, copy the download files to mirror. ``` $ find ./output -name "*.i686.rpm" | xargs rm -f $ chown 751:751 -R ./output -$ cp -rf output/akraino-r1/ /CentOS/ +$ cp -rf output/stx-r1/ / ``` In this case `` can be whatever folder you want to use as mirror. -## step 4 - Tweaks in the Akraino build system. +## step 4 - Tweaks in the StarlingX build system. NOTE: step below is not needed if you've synced the latest codebase. -Go into Akraino build system (*another* container which hosts cgcs build system), and follow up below steps: +Go into StarlingX build system (*another* container which hosts cgcs build system), and follow up below steps: ## Debugging issues -The `download_mirro.sh` script will create log files in the form of `centos_rpms_*.txt`. After the download is complete, it's recommended to check the content of these files to see if everything was downloaded correctly. +The `download_mirror.sh` script will create log files in the form of `centos_rpms_*.txt`. After the download is complete, it's recommended to check the content of these files to see if everything was downloaded correctly. A quick look into these files could be: diff --git a/centos-mirror-tools/StarlingX.repo b/centos-mirror-tools/StarlingX.repo index 9bb0eb27..42777136 100644 --- a/centos-mirror-tools/StarlingX.repo +++ b/centos-mirror-tools/StarlingX.repo @@ -312,14 +312,14 @@ enabled=1 [Starlingx-epel-7] name=Starlingx-Epel-7 -baseurl=http://linux-ftp.jf.intel.com/pub/mirrors/fedora-epel/7/x86_64/ +baseurl=https://dl.fedoraproject.org/pub/epel/7/x86_64/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 enabled=1 [Starlingx-epel-7-debug] name=Starlingx-Epel-7-debug -baseurl=http://linux-ftp.jf.intel.com/pub/mirrors/fedora-epel/7/x86_64/debug +baseurl=https://dl.fedoraproject.org/pub/epel/7/x86_64/debug gpgcheck=0 #gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 enabled=1 @@ -327,7 +327,7 @@ enabled=1 [Starlingx-epel-7-source] name=Starlingx-Epel-7-source -baseurl=http://linux-ftp.jf.intel.com/pub/mirrors/fedora-epel/7/SRPMS/ +baseurl=https://dl.fedoraproject.org/pub/epel/7/SRPMS/ gpgcheck=0 #gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 enabled=1 @@ -335,21 +335,21 @@ enabled=1 [Starlingx-epel-7-testing] name=Starlingx-Epel-7 -baseurl=http://linux-ftp.jf.intel.com/pub/mirrors/fedora-epel/testing/7/x86_64/ +baseurl=https://dl.fedoraproject.org/pub/epel/testing/7/x86_64/ gpgcheck=0 #gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 enabled=1 [Starlingx-epel-7-testing-debug] name=Starlingx-Epel-7 -baseurl=http://linux-ftp.jf.intel.com/pub/mirrors/fedora-epel/testing/7/x86_64/debug/ +baseurl=https://dl.fedoraproject.org/pub/epel/testing/7/x86_64/debug/ gpgcheck=0 #gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 enabled=1 [Starlingx-epel-7-testing-source] name=Starlingx-Epel-7-source -baseurl=http://linux-ftp.jf.intel.com/pub/mirrors/fedora-epel/testing/7/SRPMS/ +baseurl=https://dl.fedoraproject.org/pub/epel/testing/7/SRPMS/ gpgcheck=0 #gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 enabled=1 diff --git a/centos-mirror-tools/rpms_from_3rd_parties.lst b/centos-mirror-tools/rpms_from_3rd_parties.lst index 0d66bcbf..5e857421 100644 --- a/centos-mirror-tools/rpms_from_3rd_parties.lst +++ b/centos-mirror-tools/rpms_from_3rd_parties.lst @@ -77,7 +77,7 @@ novnc-0.6.2-1.el7.src.rpm#http://cbs.centos.org/kojifiles/packages/novnc/0.6.2/1 nss-softokn-3.28.3-8.el7_4.x86_64.rpm#http://vault.centos.org/7.4.1708/updates/x86_64/Packages/nss-softokn-3.28.3-8.el7_4.x86_64.rpm nss-softokn-devel-3.28.3-8.el7_4.x86_64.rpm#http://vault.centos.org/7.4.1708/updates/x86_64/Packages/nss-softokn-devel-3.28.3-8.el7_4.x86_64.rpm nss-softokn-freebl-3.28.3-8.el7_4.x86_64.rpm#http://vault.centos.org/7.4.1708/updates/x86_64/Packages/nss-softokn-freebl-3.28.3-8.el7_4.x86_64.rpm -nss-softokn-freebl-devel-3.28.3-8.el7_4.x86_64.rpm#http://ftp.ksu.edu.tw/FTP/CentOS/7.4.1708/updates/x86_64/Packages/nss-softokn-freebl-devel-3.28.3-8.el7_4.x86_64.rpm +nss-softokn-freebl-devel-3.28.3-8.el7_4.x86_64.rpm#http://vault.centos.org/7.4.1708/updates/x86_64/Packages/nss-softokn-freebl-devel-3.28.3-8.el7_4.x86_64.rpm openldap-2.4.44-5.el7.x86_64.rpm#http://vault.centos.org/7.4.1708/os/x86_64/Packages/openldap-2.4.44-5.el7.x86_64.rpm openscap-1.2.14-2.el7.x86_64.rpm#http://vault.centos.org/7.4.1708/os/x86_64/Packages/openscap-1.2.14-2.el7.x86_64.rpm openscap-scanner-1.2.14-2.el7.x86_64.rpm#http://vault.centos.org/7.4.1708/os/x86_64/Packages/openscap-scanner-1.2.14-2.el7.x86_64.rpm