Browse Source

vbootstrap: add patch2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12257 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 4 years ago
parent
commit
b0f22d2b13

+ 10 - 0
v/vbootstrap/vbootstrap-0.3_mk_uramdom.patch

@@ -0,0 +1,10 @@
+--- vbootstrap-0.3/vbootstrap.sh.in.org	2017-08-28 11:20:25.000000000 +0900
++++ vbootstrap-0.3/vbootstrap.sh.in	2017-11-15 20:36:00.154855846 +0900
+@@ -102,6 +102,7 @@
+ mkdir $INSTDIR/dev
+ mknod $INSTDIR/dev/null c 1 3
+ mknod $INSTDIR/dev/console c 5 1
++mknod $INSTDIR/dev/urandom c 1 9
+ 
+ # install base vine linux system.
+ echo $"Installing basesystem."

+ 11 - 0
v/vbootstrap/vbootstrap-delete_last_slash.patch

@@ -0,0 +1,11 @@
+--- vbuilder.sh.in.orig	2019-10-12 12:36:45.836289418 +0900
++++ vbuilder.sh.in	2019-10-12 14:51:27.171911654 +0900
+@@ -832,7 +832,7 @@
+     $__chroot_sh "cd ${BUILD_DIR}/SRPMS && apt-get -o APT::Install::Virtual=true -y build-dep $BASE_RPM_PKG"
+     $__chroot_sh "cd ${BUILD_DIR}/SRPMS && su ${BUILD_USER} -c 'rpmbuild --rebuild $RPM_OPTS $BASE_RPM_PKG'"
+ 
+-    BUILT_RPMS_LIST=$(find $BUILD_ROOT${BUILD_DIR}/RPMS -type f -regex '.*\.rpm' | sed -e s,${BUILD_ROOT},,g -e 's|.*\/compat32-.*||g' -e 's|.*\/.*\.src\.rpm||g' -e 's/$/ \\/g')
++    BUILT_RPMS_LIST=$(find $BUILD_ROOT${BUILD_DIR}/RPMS -type f -regex '.*\.rpm' | sed -e s,${BUILD_ROOT},,g -e 's|.*\/compat32-.*||g' -e 's|.*\/.*\.src\.rpm||g' -e 's/$/ \\/g' | sed -e s/\\\\$//g)
+ 
+     [ $with_category_nonfree -eq 1 ] && \
+ 	[ ! -z "$(echo $BUILT_RPMS_LIST | grep -e 'self-build-' -e 'install-assist-')" ] && \

+ 11 - 1
v/vbootstrap/vbootstrap-vl.spec

@@ -7,12 +7,14 @@ Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
 Name: vbootstrap
 Version: %{version}
-Release: 1%{?_dist_release}
+Release: 3%{?_dist_release}
 License: public domain
 Group: Development/Tools
 Url: http://trac.vinelinux.org/wiki/VineBootstrap
 
 Source0: %{name}-%{version}.tar.xz
+Patch1: vbootstrap-0.3_mk_uramdom.patch
+Patch2: vbootstrap-delete_last_slash.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
@@ -54,6 +56,8 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
 %setup
+%patch1 -p1
+%patch2
 
 %build
 %__make \
@@ -92,6 +96,12 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Sat Oct 12 2019 Toshiaki Ara <ara_t@384.jp> 0.3-3
+- add patch2 to fix install error
+
+* Wed Nov 15 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.3-2
+- add patch1 to fix nss error (add mknod urandom)
+
 * Mon Aug 28 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.3-1
 - add support overlayfs (instead of aufs)