LISTSERV mailing list manager LISTSERV 16.5

Help for XROOTD-DEV Archives


XROOTD-DEV Archives

XROOTD-DEV Archives


XROOTD-DEV@LISTSERV.SLAC.STANFORD.EDU


View:

Message:

[

First

|

Previous

|

Next

|

Last

]

By Topic:

[

First

|

Previous

|

Next

|

Last

]

By Author:

[

First

|

Previous

|

Next

|

Last

]

Font:

Proportional Font

LISTSERV Archives

LISTSERV Archives

XROOTD-DEV Home

XROOTD-DEV Home

XROOTD-DEV  March 2011

XROOTD-DEV March 2011

Subject:

Review of new Xrootd RPMs

From:

Brian Bockelman <[log in to unmask]>

Date:

12 Mar 2011 13:31:38 -0600Sat, 12 Mar 2011 13:31:38 -0600

Content-Type:

multipart/signed

Parts/Attachments:

Parts/Attachments

text/plain (154 lines) , smime.p7s (154 lines)

Hi,

Took the chance to review Lukasz's new RPMs.  Here are my items of concern:
- libXrdPss.so is in the server, but depends on libXrdFfs.so.  Hence, xrootd-server is dependent on xrootd-fuse is dependent on fuse.
  - In general, we probably want to remove the dependency on libfuse from libXrdPss.
- We probably want to make sub-RPMs for the different security plugins (ssl, gsi, krb5, etc)
- It's bad form to have multiple sources if the items in the .spec file if they're included in the tarball.  I.e., instead of:
  install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/cmsd
You could have done:
  install -m 755 packaging/rhel/cmsd.init $RPM_BUILD_ROOT%{_initrddir}/cmsd
This cuts down on the number of sources and hence the ability for folks to introduce errors.
- It is kind and traditional to include in comments where the sources can be taken from.  I.e., from my Xrootd RPM:
# git clone http://xrootd.org/repo/xrootd.git xrootd
# cd xrootd
# git-archive master | gzip -9 > ~/rpmbuild/SOURCES/xrootd.tgz
Source0:        xrootd.tgz
- I strongly suggest a sample configuration file so the user can do a "yum install xrootd; service xrootd start" and have something working immediately.  I have samples I give folks, but assuredly Andy won't like them because they include GSI security by default :).  Willing to contribute if no one else pipes up.
- I notice you have three xrootd config files ({xrootd,cmsd,frmd}-main.cf) - I thought it was the general style of the project to have one config file?
- Couldn't get the makesrpm.sh script to work.  Failed with:
[brian@brian-test packaging]$ ./makesrpm.sh 
[i] Working on: ../
[i] Stoing the output to: .
[i] Working with version: unknown
[i] RPM compliant version: unknown
[i] Woring in: /tmp/tmp.pEERkq7868
fatal: unrecognized argument: --format=%H
[!] Unable to figure out the git commit hash
Poking around a little, it seems to be due to me not being on an exact tag.  I think instead of:
git log -1 --format='%ai %h'
you want:
git log -1 --pretty=format:'%ai %H'
Fixing this, the version number appears something like this:
20110312.73b5e2f
Could we instead use something like "git describe"'s output?
v3.0.2-90-g73b5e2f
This is something we can more easily mangle into the RPM.
- makesrpm.sh doesn't work because I have local macros set.  I removed your "dirty hack" and, with the patch below, it works.
- I strongly recommend adding an xrootd user rather than having it run as 'daemon'.
- What about the "cnsd" daemon?  No started up script is given for that.
- I'm not sure it's really plausible to have multiple xrootds run in this setup, but I think that's a larger issue 
- You probably want to add at least "Epoch: 1" here in order to match the EPEL packaging.

I have tried to include as many of these comments in a patch below; some require input or decision making from your side.

Overall, a great improvement!  Thanks Lukasz!  With a bit more finessing, I can put my separate RPMs to rest.

Brian


diff --git a/packaging/makesrpm.sh b/packaging/makesrpm.sh
index f62d693..45d4045 100755
--- a/packaging/makesrpm.sh
+++ b/packaging/makesrpm.sh
@@ -128,11 +128,12 @@ echo "[i] RPM compliant version: $VERSION"
 # exit on any error
 set -e
 
-TEMPDIR=`mktemp -d`
+TEMPDIR=`mktemp -d -t tmp.xrootd.srpm.XXXXXXX`
 RPMSOURCES=$TEMPDIR/rpmbuild/SOURCES
 mkdir -p $RPMSOURCES
+mkdir -p $TEMPDIR/rpmbuild/SRPMS
 
-echo "[i] Woring in: $TEMPDIR" 1>&2
+echo "[i] Working in: $TEMPDIR" 1>&2
 
 if test -d rhel -a -r rhel; then
   for i in rhel/*; do
@@ -154,7 +155,7 @@ set +e
 
 CWD=$PWD
 cd $SOURCEPATH
-COMMIT=`git log --format="%H" -1`
+COMMIT=`git log --pretty=format:"%H" -1`
 
 if test $? -ne 0; then
   echo "[!] Unable to figure out the git commit hash" 1>&2
@@ -185,8 +186,8 @@ cat rhel/xrootd.spec.in | sed "s/__VERSION__/$VERSION/" > $TEMPDIR/xrootd.s
 echo "[i] Creating the source RPM..."
 
 # Dirty, dirty hack!
-export HOME=$TEMPDIR
-rpmbuild -bs $TEMPDIR/xrootd.spec > $TEMPDIR/log
+echo "%_topdir $TEMPDIR/rpmbuild" > $TEMPDIR/rpmmacros
+rpmbuild --define "_topdir $TEMPDIR/rpmbuild" -bs $TEMPDIR/xrootd.spec > $TEMPDIR/log
 if test $? -ne 0; then
   echo "[!] RPM creation failed" 1>&2
   exit 8


diff --git a/packaging/rhel/xrootd.spec.in b/packaging/rhel/xrootd.spec.in
index 7c8d2c6..89e24bc 100644
--- a/packaging/rhel/xrootd.spec.in
+++ b/packaging/rhel/xrootd.spec.in
@@ -5,16 +5,10 @@ Summary:   An eXtended Root Daemon (xrootd)
 Group:     System Environment/Daemons
 License:   Stanford (modified BSD with advert clause)
 URL:       http://xrootd.org/
+# git clone http://xrootd.org/repo/xrootd.git xrootd
+# cd xrootd
+# git-archive master | gzip -9 > ~/rpmbuild/SOURCES/xrootd.tgz
 Source0:   xrootd.tar.gz
-Source1:   xrootd.sysconfig
-Source2:   cmsd.init
-Source3:   frm_purged.init
-Source4:   frm_xfrd.init
-Source5:   xrootd.init
-Source6:   xrootd.functions
-Source7:   xrootd-main.cf
-Source8:   cmsd-main.cf
-Source9:   frmd-main.cf
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: autoconf automake libtool readline-devel openssl-devel fuse-devel libxml2-devel
@@ -89,19 +83,26 @@ mkdir -p $RPM_BUILD_ROOT%{_var}/run/%{name}
 # init stuff
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/cmsd
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/frm_purged
-install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/frm_xfrd
-install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/xrootd
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_initrddir}/xrootd.functions
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/xrootd-main.cf
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cmsd-main.cf
-install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/frmd-main.cf
+install -m 644 packaging/rhel/xrootd.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+install -m 755 packaging/rhel/cmsd.init $RPM_BUILD_ROOT%{_initrddir}/cmsd
+install -m 755 packaging/rhel/frm_purged.init $RPM_BUILD_ROOT%{_initrddir}/frm_purged
+install -m 755 packaging/rhel/frm_xfrd.init $RPM_BUILD_ROOT%{_initrddir}/frm_xfrd
+install -m 755 packaging/rhel/xrootd.init $RPM_BUILD_ROOT%{_initrddir}/xrootd
+install -m 755 packaging/rhel/xrootd.functions $RPM_BUILD_ROOT%{_initrddir}/xrootd.functions
+install -m 644 packaging/common/xrootd-main.cf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/xrootd-ma
+install -m 644 packaging/common/cmsd-main.cf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cmsd-main.c
+install -m 644 packaging/common/frmd-main.cf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/frmd-main.c
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+getent group xrootd >/dev/null || groupadd -r xrootd
+getent passwd xrootd >/dev/null || \
+       useradd -r -g xrootd -c "Xrootd runtime user" \
+       -s /sbin/nologin -d /etc/xrootd xrootd
+exit 0
+
 %post
 /sbin/chkconfig --add xrootd
 /sbin/chkconfig --add cmsd



Top of Message | Previous Page | Permalink

Advanced Options


Options

Log In

Log In

Get Password

Get Password


Search Archives

Search Archives


Subscribe or Unsubscribe

Subscribe or Unsubscribe


Archives

August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
December 2010
November 2010
October 2010
September 2010

ATOM RSS1 RSS2



LISTSERV.SLAC.STANFORD.EDU

Secured by F-Secure Anti-Virus CataList Email List Search Powered by the LISTSERV Email List Manager

Privacy Notice, Security Notice and Terms of Use