From 7d8a1fd9626e8470d8315272d822d7df80c582e9 Mon Sep 17 00:00:00 2001 From: dogsheng <960055655@qq.com> Date: Fri, 17 Apr 2020 09:56:43 +0800 Subject: [PATCH] update obs repo --- openEuler_chroot.spec | 49 +++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/openEuler_chroot.spec b/openEuler_chroot.spec index f102d80..dff27a0 100644 --- a/openEuler_chroot.spec +++ b/openEuler_chroot.spec @@ -12,14 +12,14 @@ BuildRequires: dos2unix e2fsprogs filesystem info make tar vim perl libselinux- Buildrequires: wget tar bzip2 sudo yum-plugin-fastestmirror iputils expect git dnf-utils yum %description -Use for make iso in euleros chroot +Use for make iso in openeuler chroot %prep #%setup %build -mkdir -p /home/euleros_chroot -cd /home/euleros_chroot +mkdir -p /home/openeuler_chroot +cd /home/openeuler_chroot cat < obs_repo.conf [main] @@ -47,28 +47,28 @@ reposdir=/xxx # PUT YOUR REPOS HERE OR IN separate files named file.repo # in /etc/yum.repos.d -[obs-CompileTools] -name=obs-CompileTools -baseurl=http://euleros-obs-repo.huawei.com:82/openEuler:/CompileTools/%{_repository}/ +[obs-bringInRely] +name=obs-bringInRely +baseurl=http://openeuler-obs-repo.huawei.com:82/bringInRely/%{_repository}/ enabled=1 gpgcheck=0 [obs-Mainline] name=obs-Mainline -baseurl=http://euleros-obs-repo.huawei.com:82/openEuler:/Mainline/%{_repository}/ +baseurl=http://openeuler-obs-repo.huawei.com:82/openEuler:/Mainline/%{_repository}/ enabled=1 gpgcheck=0 [obs-Extras] name=obs-Extras -baseurl=http://euleros-obs-repo.huawei.com:82/openEuler:/Extras/%{_repository}/ +baseurl=http://openeuler-obs-repo.huawei.com:82/openEuler:/Extras/%{_repository}/ enabled=1 gpgcheck=0 END1 -echo "119.3.219.20 euleros-obs-repo.huawei.com" >> /etc/hosts +echo "119.3.219.20 openeuler-obs-repo.huawei.com" >> /etc/hosts rpm_lst="pigz expect wget bash vim grep patch tar gzip bzip2 openssh-clients yum perl createrepo_c dnf-utils" myrepo=%{_repository} @@ -77,15 +77,15 @@ rpm_lst="${rpm_lst}" fi if which yum &> /dev/null; then - yum install -c obs_repo.conf --installroot=/home/euleros_chroot/ -y $rpm_lst -x glibc32 + yum install -c obs_repo.conf --installroot=/home/openeuler_chroot/ -y $rpm_lst -x glibc32 else - yum-deprecated install -c obs_repo.conf --installroot=/home/euleros_chroot/ -y $rpm_lst -x glibc32 + yum-deprecated install -c obs_repo.conf --installroot=/home/openeuler_chroot/ -y $rpm_lst -x glibc32 fi -cat < ./init_euleros_chroot.sh +cat < ./init_openeuler_chroot.sh #!/bin/sh -cd /usr1/euleros -BUILD_ROOT=/usr1/euleros +cd /usr1/openeuler +BUILD_ROOT=/usr1/openeuler local com file mode arg mkdir -m 755 -p \$BUILD_ROOT/dev/pts @@ -130,15 +130,15 @@ tar czf compile_env.tar.gz * #ls * | grep -v proc | xargs -i tar czf compile_env.tar.gz {} %install -mkdir -p %{buildroot}/usr1/euleros -cp -a /home/euleros_chroot/compile_env.tar.gz %{buildroot}/usr1/euleros +mkdir -p %{buildroot}/usr1/openeuler +cp -a /home/openeuler_chroot/compile_env.tar.gz %{buildroot}/usr1/openeuler %pre %post -cd /usr1/euleros +cd /usr1/openeuler tar xf compile_env.tar.gz && rm -rf compile_env.tar.gz -BUILD_ROOT=/usr1/euleros +BUILD_ROOT=/usr1/openeuler mkdir -m 755 -p $BUILD_ROOT/dev/pts test -d $BUILD_ROOT/dev/shm || rm -f $BUILD_ROOT/dev/shm @@ -181,9 +181,9 @@ mount --bind /proc $BUILD_ROOT/proc %postun i=0 -while cat /proc/mounts | grep '/usr1/euleros' &> /dev/null +while cat /proc/mounts | grep '/usr1/openeuler' &> /dev/null do - while read a;do if echo $a | grep '/usr1/euleros' &> /dev/null; then dir=`echo $a | awk '{print $2}'`;umount -f $dir;fi;done < /proc/mounts + while read a;do if echo $a | grep '/usr1/openeuler' &> /dev/null; then dir=`echo $a | awk '{print $2}'`;umount -f $dir;fi;done < /proc/mounts ((i++)) if [ $i -ge 8 ]; then break @@ -194,12 +194,12 @@ done #umount -f /usr1/euleros/dev/pts #umount -f /usr1/euleros/dev #umount -f /usr1/euleros/var/run/dbus -rm -rf /usr1/euleros +rm -rf /usr1/openeuler %files %defattr(-,root,root) -%dir /usr1/euleros -/usr1/euleros/* +%dir /usr1/openeuler +/usr1/openeuler/* %clean rm -rf $RPM_BUILD_ROOT/* @@ -207,6 +207,9 @@ rm -rf %{_tmppath}/%{name}-%{version} rm -rf $RPM_BUILD_DIR/%{name}-%{version} %changelog +* Fri Apr 17 20120 dongjian - 1.0-0.6 +- init repo + * Thu Oct 31 2019 yanan - 1.0-0.6 - Type:enhancement - ID:NA -- Gitee