ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

Accepting request 1030495 from home:hmzhao:branches:network:ha-clustering:Factory

Browse Source 
- ocfs2-tools: finish UsrMerge, install to /usr (bsc#1191084)
  + modify ocfs2_tools.spec to following UsrMerge rule

OBS-URL: https://build.opensuse.org/request/show/1030495
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=147
This commit is contained in:
heming zhao 2022-10-22 09:05:32 +00:00 committed by Git OBS Bridge
parent 0387c9fea1
commit a35776f519
2 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ocfs2-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Oct 22 08:40:00 UTC 2022 - heming.zhao@suse.com
- ocfs2-tools: finish UsrMerge, install to /usr (bsc#1191084)
+ modify ocfs2_tools.spec to following UsrMerge rule
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 7 10:26:00 UTC 2022 - heming.zhao@suse.com Fri Sep 7 10:26:00 UTC 2022 - heming.zhao@suse.com

72
ocfs2-tools.spec
View File

@ -21,6 +21,15 @@
%define _fillupdir /var/adm/fillup-templates %define _fillupdir /var/adm/fillup-templates
%endif %endif
#see bsc#1191084
%if !0%{?usrmerged}
# for SLEs
%define sbindir /sbin
%else
# for opensuse
%define sbindir %{_sbindir}
%endif
#if run "rpmbuild --with=ocfs2console" #if run "rpmbuild --with=ocfs2console"
#_with_ocfs2console will be automatically defined #_with_ocfs2console will be automatically defined
%if %{defined _with_ocfs2console} %if %{defined _with_ocfs2console}
@ -180,11 +189,16 @@ export PROJECT="ocfs2-tools"
autoreconf -fi -I /usr/share/aclocal autoreconf -fi -I /usr/share/aclocal
%configure --disable-debug \ %configure --disable-debug \
%if 0%{_ocfs2console} == 1 %if 0%{_ocfs2console} == 1
--enable-ocfs2console=yes \ --enable-ocfs2console=yes \
%endif %endif
--enable-dynamic-fsck=yes \ --enable-dynamic-fsck=yes \
--enable-dynamic-ctl=yes --enable-dynamic-ctl=yes \
%if !0%{?usrmerged}
# "do nothing"
%else
--with-root-prefix=/usr
%endif
make OPTS="%{optflags}" make OPTS="%{optflags}"
@ -195,7 +209,7 @@ make reflink
cd .. cd ..
%install %install
mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}%{sbindir}
mkdir -p %{buildroot}%{_prefix}/bin mkdir -p %{buildroot}%{_prefix}/bin
mkdir -p %{buildroot}%{_fillupdir} mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_udevrulesdir} mkdir -p %{buildroot}%{_udevrulesdir}
@ -204,16 +218,16 @@ cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_fillupdir}/sysconfig.o2cb
%if %{systemd_enabled} %if %{systemd_enabled}
mkdir -p %{buildroot}/usr/lib/systemd/system mkdir -p %{buildroot}/usr/lib/systemd/system
cp -f vendor/common/o2cb.service %{buildroot}/usr/lib/systemd/system/ cp -f vendor/common/o2cb.service %{buildroot}/usr/lib/systemd/system/
cp -f vendor/common/ocfs2.service %{buildroot}/usr/lib/systemd/system/ cp -f vendor/common/ocfs2.service %{buildroot}/usr/lib/systemd/system/
cp -f vendor/common/o2cb.init %{buildroot}/sbin cp -f vendor/common/o2cb.init %{buildroot}%{sbindir}
cp -f vendor/common/ocfs2.init %{buildroot}/sbin cp -f vendor/common/ocfs2.init %{buildroot}%{sbindir}
%else %else
mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}%{_sysconfdir}/init.d
cp -f vendor/common/o2cb.init %{buildroot}%{_sysconfdir}/init.d/o2cb cp -f vendor/common/o2cb.init %{buildroot}%{_sysconfdir}/init.d/o2cb
cp -f vendor/common/ocfs2.init %{buildroot}%{_sysconfdir}/init.d/ocfs2 cp -f vendor/common/ocfs2.init %{buildroot}%{_sysconfdir}/init.d/ocfs2
ln -sf ..%{_sysconfdir}/init.d/o2cb %{buildroot}/sbin/rco2cb ln -sf ..%{_sysconfdir}/init.d/o2cb %{buildroot}%{sbindir}/rco2cb
ln -sf ..%{_sysconfdir}/init.d/ocfs2 %{buildroot}/sbin/rcocfs2 ln -sf ..%{_sysconfdir}/init.d/ocfs2 %{buildroot}%{sbindir}/rcocfs2
%endif %endif
make DESTDIR="%{buildroot}" install make DESTDIR="%{buildroot}" install
@ -221,9 +235,11 @@ cd reflink
make DESTDIR="%{buildroot}" install make DESTDIR="%{buildroot}" install
cd .. cd ..
%if !0%{?usrmerged}
mv %{buildroot}/{,/usr}/sbin/o2image mv %{buildroot}/{,/usr}/sbin/o2image
mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2 mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
#mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk #mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk
%endif
chmod a-x %{buildroot}/%{_libdir}/libo2cb.a chmod a-x %{buildroot}/%{_libdir}/libo2cb.a
chmod a-x %{buildroot}/%{_libdir}/libo2dlm.a chmod a-x %{buildroot}/%{_libdir}/libo2dlm.a
chmod a-x %{buildroot}/%{_libdir}/libocfs2.a chmod a-x %{buildroot}/%{_libdir}/libocfs2.a
@ -266,14 +282,14 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
%doc documentation/users_guide.txt %doc documentation/users_guide.txt
%dir /usr/lib/udev %dir /usr/lib/udev
%dir %{_udevrulesdir} %dir %{_udevrulesdir}
/sbin/fsck.ocfs2 %{sbindir}/fsck.ocfs2
/sbin/mkfs.ocfs2 %{sbindir}/mkfs.ocfs2
/sbin/mounted.ocfs2 %{sbindir}/mounted.ocfs2
/sbin/tunefs.ocfs2 %{sbindir}/tunefs.ocfs2
/sbin/mount.ocfs2 %{sbindir}/mount.ocfs2
/sbin/ocfs2_hb_ctl %{sbindir}/ocfs2_hb_ctl
/sbin/o2cluster %{sbindir}/o2cluster
/sbin/defragfs.ocfs2 %{sbindir}/defragfs.ocfs2
%{_sbindir}/o2image %{_sbindir}/o2image
%{_sbindir}/debugfs.ocfs2 %{_sbindir}/debugfs.ocfs2
%{_sbindir}/o2hbmonitor %{_sbindir}/o2hbmonitor
@ -308,17 +324,17 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
%files o2cb %files o2cb
%defattr(-,root,root) %defattr(-,root,root)
%doc README.O2CB %doc README.O2CB
/sbin/o2cb_ctl %{sbindir}/o2cb_ctl
/sbin/o2cb %{sbindir}/o2cb
%if %{systemd_enabled} %if %{systemd_enabled}
/sbin/o2cb.init %{sbindir}/o2cb.init
/sbin/ocfs2.init %{sbindir}/ocfs2.init
/usr/lib/systemd/system/o2cb.service /usr/lib/systemd/system/o2cb.service
/usr/lib/systemd/system/ocfs2.service /usr/lib/systemd/system/ocfs2.service
%else %else
/sbin/rco2cb %{sbindir}/rco2cb
/sbin/rcocfs2 %{sbindir}/rcocfs2
%{_sysconfdir}/init.d/o2cb %{_sysconfdir}/init.d/o2cb
%{_sysconfdir}/init.d/ocfs2 %{_sysconfdir}/init.d/ocfs2
%endif %endif