From d1c66d5dba6fc7eaae0ef2f2d81f5229ac16f823 Mon Sep 17 00:00:00 2001
From: wangchong1995924 <15229716099@163.com>
Date: Tue, 24 May 2022 11:20:52 +0800
Subject: [PATCH] delete annotation and hide ip

---
 openEuler_chroot.spec | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/openEuler_chroot.spec b/openEuler_chroot.spec
index ddd3bd0..a729197 100644
--- a/openEuler_chroot.spec
+++ b/openEuler_chroot.spec
@@ -5,7 +5,7 @@ Summary:        Use for make iso in openEuler chroot
 License:        GPL
 Group:          System/Management
 Version:        1.0
-Release:        7
+Release:        8
 BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildArch:      noarch
 BuildRequires:  dos2unix e2fsprogs filesystem info make tar vim perl libselinux-python3 coreutils
@@ -15,7 +15,6 @@ Buildrequires:  wget tar bzip2 sudo iputils expect git dnf-utils yum
 Use for make iso in openeuler chroot
 
 %prep
-#%setup
 
 %build
 mkdir -p /home/openeuler_chroot
@@ -49,26 +48,26 @@ reposdir=/xxx
 
 [obs-bringInRely]
 name=obs-bringinrely
-baseurl=http://openeuler-obs-repo.huawei.com:82/bringInRely/%{_repository}/
+baseurl=http://openeuler-obs-repo.huawei.com:82/bringInRely:/20.09/%{_repository}/
 enabled=1
 gpgcheck=0
 
-[obs-Mainline]
-name=obs-Mainline
-baseurl=http://openeuler-obs-repo.huawei.com:82/openEuler:/Mainline/%{_repository}/
+[obs-20_09]
+name=obs-20_09
+baseurl=http://openeuler-obs-repo.huawei.com:82/openEuler:/20.09/%{_repository}/
 enabled=1
 gpgcheck=0
 
 [obs-Extras]
 name=obs-Extras
-baseurl=http://openeuler-obs-repo.huawei.com:82/openEuler:/Extras/%{_repository}/
+baseurl=http://openeuler-obs-repo.huawei.com:82/openEuler:/20.09:/Extras/%{_repository}/
 enabled=1
 gpgcheck=0
 
 
 END1
 
-echo "119.3.219.20 openeuler-obs-repo.huawei.com" >> /etc/hosts
+echo "x.x.x.x 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}
@@ -122,12 +121,9 @@ mount -n -tdevpts -omode=0620,gid=5 none \$BUILD_ROOT/dev/pts
 mkdir -p \$BUILD_ROOT/proc \$BUILD_ROOT/sys
 mount --bind /proc \$BUILD_ROOT/proc
 mount --bind /sys \$BUILD_ROOT/sys
-#mkdir -p \$BUILD_ROOT/var/run/dbus
-#mount -n --bind /var/run/dbus \$BUILD_ROOT/var/run/dbus
 END1
 
 tar czf compile_env.tar.gz *
-#ls * | grep -v proc | xargs -i tar czf compile_env.tar.gz {}
 
 %install
 mkdir -p %{buildroot}/usr1/openeuler
@@ -174,8 +170,6 @@ mount -n -tdevpts -omode=0620,gid=5 none $BUILD_ROOT/dev/pts
 mkdir -p $BUILD_ROOT/proc $BUILD_ROOT/sys
 mount --bind /sys $BUILD_ROOT/sys
 mount --bind /proc $BUILD_ROOT/proc
-#mkdir -p $BUILD_ROOT/var/run/dbus
-#mount -n --bind /var/run/dbus $BUILD_ROOT/var/run/dbus
 
 rm -rf $BUILD_ROOT/etc/yum.repos.d/openEuler.repo
 touch $BUILD_ROOT/etc/yum.repos.d/openEuler.repo
@@ -192,11 +186,6 @@ do
         break
     fi
 done
-#umount -f /usr1/euleros/proc
-#umount -f /usr1/euleros/sys
-#umount -f /usr1/euleros/dev/pts
-#umount -f /usr1/euleros/dev
-#umount -f /usr1/euleros/var/run/dbus
 rm -rf /usr1/openeuler
 
 %files
@@ -210,6 +199,12 @@ rm -rf %{_tmppath}/%{name}-%{version}
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 %changelog
+* Tue May 24 2022 wangchong<wangchong56@huawei.com> - 1.0-8
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:delete annotation and hide ip
+
 * Tue Aug 25 2020 zhangrui<zhangrui182@huawei.com> - 1.0-7
 - Type:enhancement
 - ID:NA
-- 
Gitee