From e17bda79e7e7f905360a5fa9e2645dfd8829cd19 Mon Sep 17 00:00:00 2001 From: wangchong1995924 <15229716099@163.com> Date: Tue, 24 May 2022 10:43:33 +0800 Subject: [PATCH] delete annotation and hide ip (cherry picked from commit 02d98947937293c06dca999cbc88317d462d75b7) --- openEuler_chroot.spec | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/openEuler_chroot.spec b/openEuler_chroot.spec index 06ec61a..08569ea 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: 0.8 +Release: 0.9 BuildRoot: %{_tmppath}/%{name}-%{version} BuildArch: noarch BuildRequires: dos2unix e2fsprogs filesystem info make tar vim perl libselinux-python coreutils @@ -15,7 +15,6 @@ Buildrequires: wget tar bzip2 sudo yum-plugin-fastestmirror iputils expect git Use for make iso in openeuler chroot %prep -#%setup %build mkdir -p /home/openeuler_chroot @@ -68,7 +67,7 @@ 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 - 1.0-0.9 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:delete annotation and hide ip + * Thu Oct 31 2019 yanan - 1.0-0.6 - Type:enhancement - ID:NA -- Gitee