From a0efc4cffbd84898c454d27eaf946d073dfdad0f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 10 Dec 2008 18:10:03 +0100 Subject: Fix some merge omissions for GPFS --- packaging/RHEL-CTDB/configure.rpm | 67 +++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 23 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 7596040205..358b40db10 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -1,37 +1,56 @@ +#!/bin/sh case `uname -m` in - x86_64) - libdir=/usr/lib64/samba - ;; - *) - libdir=/usr/lib/samba - ;; + x86_64) + _libarch=lib64 + ;; + *) + _libarch=lib + ;; esac -CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \ - --prefix=/usr \ - --localstatedir=/var \ - --with-configdir=/etc/samba \ - --with-libdir=$libdir \ - --with-lockdir=/var/lib/samba \ - --with-logfilebase=/var/log/samba \ - --with-mandir=/usr/man \ - --with-piddir=/var/run \ - --with-privatedir=/etc/samba \ - --with-sambabook=/usr/share/swat/using_samba \ - --with-swatdir=/usr/share/swat \ +_libarchdir=/usr/${_libarch} + +_prefix=/usr +_sysconfdir=/etc +_mandir=/usr/man +_datadir=/usr/share + +# check for ccache +ccache -h 2>&1 > /dev/null +if [ $? -eq 0 ]; then + CC="ccache gcc" +else + CC="gcc" +fi + +./autogen.sh + +CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \ + --prefix=${_prefix} \ + --localstatedir=/var \ + --with-configdir=${_sysconfdir}/samba \ + --with-libdir=${_libarchdir}/samba \ + --with-pammodulesdir=/${_libarch}/security \ + --with-lockdir=/var/lib/samba \ + --with-logfilebase=/var/log/samba \ + --with-mandir=${_mandir} \ + --with-piddir=/var/run \ + --with-privatedir=${_sysconfdir}/samba \ + --with-sambabook=${_datadir}/swat/using_samba \ + --with-swatdir=${_datadir}/swat \ --disable-cups \ - --with-acl-support \ + --with-acl-support \ --with-ads \ - --with-automount \ - --with-fhs \ + --with-automount \ + --with-fhs \ --with-pam_smbpass \ --with-libsmbclient \ --with-libsmbsharemodes \ - --without-smbwrapper \ + --without-smbwrapper \ --with-pam \ --with-quotas \ - --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ + --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \ --with-syslog \ --with-utmp \ --with-cluster-support \ @@ -40,3 +59,5 @@ CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \ --without-dnsupdate \ --with-aio-support \ $* + +make showlayout -- cgit From 7c2bdead9e3e4436e427668a16df367e14885cbc Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 10 Dec 2008 23:14:46 +0100 Subject: Revert "Fix some merge omissions for GPFS" This reverts commit a0efc4cffbd84898c454d27eaf946d073dfdad0f. This one should have been done with careful cherry-picks, sorry. Volker --- packaging/RHEL-CTDB/configure.rpm | 67 ++++++++++++++------------------------- 1 file changed, 23 insertions(+), 44 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 358b40db10..7596040205 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -1,56 +1,37 @@ -#!/bin/sh case `uname -m` in - x86_64) - _libarch=lib64 - ;; - *) - _libarch=lib - ;; + x86_64) + libdir=/usr/lib64/samba + ;; + *) + libdir=/usr/lib/samba + ;; esac -_libarchdir=/usr/${_libarch} - -_prefix=/usr -_sysconfdir=/etc -_mandir=/usr/man -_datadir=/usr/share - -# check for ccache -ccache -h 2>&1 > /dev/null -if [ $? -eq 0 ]; then - CC="ccache gcc" -else - CC="gcc" -fi - -./autogen.sh - -CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \ - --prefix=${_prefix} \ - --localstatedir=/var \ - --with-configdir=${_sysconfdir}/samba \ - --with-libdir=${_libarchdir}/samba \ - --with-pammodulesdir=/${_libarch}/security \ - --with-lockdir=/var/lib/samba \ - --with-logfilebase=/var/log/samba \ - --with-mandir=${_mandir} \ - --with-piddir=/var/run \ - --with-privatedir=${_sysconfdir}/samba \ - --with-sambabook=${_datadir}/swat/using_samba \ - --with-swatdir=${_datadir}/swat \ +CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \ + --prefix=/usr \ + --localstatedir=/var \ + --with-configdir=/etc/samba \ + --with-libdir=$libdir \ + --with-lockdir=/var/lib/samba \ + --with-logfilebase=/var/log/samba \ + --with-mandir=/usr/man \ + --with-piddir=/var/run \ + --with-privatedir=/etc/samba \ + --with-sambabook=/usr/share/swat/using_samba \ + --with-swatdir=/usr/share/swat \ --disable-cups \ - --with-acl-support \ + --with-acl-support \ --with-ads \ - --with-automount \ - --with-fhs \ + --with-automount \ + --with-fhs \ --with-pam_smbpass \ --with-libsmbclient \ --with-libsmbsharemodes \ - --without-smbwrapper \ + --without-smbwrapper \ --with-pam \ --with-quotas \ - --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \ + --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ --with-syslog \ --with-utmp \ --with-cluster-support \ @@ -59,5 +40,3 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \ --without-dnsupdate \ --with-aio-support \ $* - -make showlayout -- cgit From e0a0b0a0cb3db426d05b641e1fa43d9e7f28ab71 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 18 Sep 2008 05:02:14 +0200 Subject: packaging(RHEL-CTDB): adapt configure.rpm to changes to the spec file Michael (cherry picked from commit d249a9ca2a1761f20655cbcfe39fbc942547974d) Signed-off-by: Michael Adam --- packaging/RHEL-CTDB/configure.rpm | 66 ++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 22 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 7596040205..444d3e2a8c 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -1,34 +1,53 @@ +#!/bin/sh case `uname -m` in - x86_64) - libdir=/usr/lib64/samba - ;; - *) - libdir=/usr/lib/samba - ;; + x86_64) + _libarch=lib64 + ;; + *) + _libarch=lib + ;; esac -CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \ - --prefix=/usr \ - --localstatedir=/var \ - --with-configdir=/etc/samba \ - --with-libdir=$libdir \ - --with-lockdir=/var/lib/samba \ - --with-logfilebase=/var/log/samba \ - --with-mandir=/usr/man \ - --with-piddir=/var/run \ - --with-privatedir=/etc/samba \ - --with-sambabook=/usr/share/swat/using_samba \ - --with-swatdir=/usr/share/swat \ +_libarchdir=/usr/${_libarch} + +_prefix=/usr +_sysconfdir=/etc +_mandir=/usr/man +_datadir=/usr/share + +# check for ccache +ccache -h 2>&1 > /dev/null +if [ $? -eq 0 ]; then + CC="ccache gcc" +else + CC="gcc" +fi + +./autogen.sh + +CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \ + --prefix=${_prefix} \ + --localstatedir=/var \ + --with-configdir=${_sysconfdir}/samba \ + --with-libdir=${_libarchdir}/samba \ + --with-pammodulesdir=/${_libarch}/security \ + --with-lockdir=/var/lib/samba \ + --with-logfilebase=/var/log/samba \ + --with-mandir=${_mandir} \ + --with-piddir=/var/run \ + --with-privatedir=${_sysconfdir}/samba \ + --with-sambabook=${_datadir}/swat/using_samba \ + --with-swatdir=${_datadir}/swat \ --disable-cups \ - --with-acl-support \ + --with-acl-support \ --with-ads \ - --with-automount \ - --with-fhs \ + --with-automount \ + --with-fhs \ --with-pam_smbpass \ --with-libsmbclient \ --with-libsmbsharemodes \ - --without-smbwrapper \ + --without-smbwrapper \ --with-pam \ --with-quotas \ --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ @@ -40,3 +59,6 @@ CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \ --without-dnsupdate \ --with-aio-support \ $* + +make showlayout + -- cgit From f4f477f4320835245d5d45546a7dee8dc1f4100c Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 1 Dec 2008 03:05:40 +0100 Subject: packaging(RHEL-CTDB): explicitly build the gpfs module to prevent potetential problems on PTF8 systems where there is no valid autodetecting configure check yet. Michael (cherry picked from commit 37039d345e9a25654bef038f2b8bb4b891cfa6f0) Signed-off-by: Michael Adam --- packaging/RHEL-CTDB/configure.rpm | 2 +- packaging/RHEL-CTDB/samba.spec.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 444d3e2a8c..b9a1ee12c2 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -50,7 +50,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \ --without-smbwrapper \ --with-pam \ --with-quotas \ - --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ + --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \ --with-syslog \ --with-utmp \ --with-cluster-support \ diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index b34f01f659..910fe37f34 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -167,7 +167,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --without-smbwrapper \ --with-pam \ --with-quotas \ - --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \ + --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \ --with-syslog \ --with-utmp \ --with-cluster-support \ -- cgit From 1ad04b031902aa6d89365f839178b6fb23bfdb2a Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 10 Sep 2008 23:06:28 +0200 Subject: packaging(RHEL-CTDB): fix installation of pam modules use configure parameter to specify the pam modules dir. Michael (cherry picked from commit 24282daa5e293ef9362a69f7f70a684587d6763a) --- packaging/RHEL-CTDB/samba.spec.tmpl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 910fe37f34..306ef34c3d 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -149,6 +149,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --with-configdir=%{_sysconfdir}/samba \ --libdir=%{_libarchdir} \ --with-modulesdir=%{_libarchdir}/samba \ + --with-pammodulesdir=%{_libarch}/security \ --with-lockdir=/var/lib/samba \ --with-logfilebase=/var/log/samba \ --with-mandir=%{_mandir} \ @@ -230,8 +231,7 @@ make DESTDIR=$RPM_BUILD_ROOT \ install cd .. -# NSS & PAM winbind support -install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_winbind.so +# NSS winbind support install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2 ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_winbind.so.2 libnss_winbind.so ) @@ -242,8 +242,6 @@ install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/lib #install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so # ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so libnss_wins.so.2 ) -# Install pam_smbpass.so -install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so ## cleanup /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security -- cgit From 9ecb169debbdfea03036dc293366bf2063be1448 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 12 Sep 2008 15:50:33 +0200 Subject: packaging(RHEL-CTDB): refactor creation of spec file from template out into new script makespec.sh Michael (cherry picked from commit d49a9d1c67e4d98017ce5f7d1351bca1366e1a8d) (cherry picked from commit 086873f00de96ca48717b05dddb71e776c74ca7d) --- packaging/RHEL-CTDB/makerpms.sh | 25 ++++++------------------- packaging/RHEL-CTDB/makespec.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 19 deletions(-) create mode 100755 packaging/RHEL-CTDB/makespec.sh (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh index 219982fda9..c85b865f79 100755 --- a/packaging/RHEL-CTDB/makerpms.sh +++ b/packaging/RHEL-CTDB/makerpms.sh @@ -25,8 +25,6 @@ RPMSRCDIR=`rpm --eval %_sourcedir` DIRNAME=$(dirname $0) TOPDIR=${DIRNAME}/../.. -SRCDIR=${TOPDIR}/source -VERSION_H=${SRCDIR}/include/version.h SPECFILE="samba.spec" DOCS="docs.tar.bz2" @@ -49,25 +47,14 @@ esac ## ## determine the samba version and create the SPEC file ## -pushd ${SRCDIR} -./script/mkversion.sh -popd -if [ ! -f ${VERSION_H} ] ; then - echo "Error creating version.h" - exit 1 +${DIRNAME}/makespec.sh +RC=$? +if [ $RC -ne 0 ]; then + exit ${RC} fi -VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'` -vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'` -if test "x${vendor_version}" != "x" ; then - VERSION="${VERSION}-${vendor_version}" -fi -VERSION=`echo ${VERSION} | sed 's/-/_/g'` -VERSION=`echo ${VERSION} | sed 's/\"//g'` -echo "VERSION: ${VERSION}" -sed -e s/PVERSION/${VERSION}/g \ - < ${DIRNAME}/${SPECFILE}.tmpl \ - > ${DIRNAME}/${SPECFILE} +RELEASE=$(grep ^Release ${DIRNAME}${SPECFILE} | sed -e 's/^Release:\ \+//') +VERSION=$(grep ^Version ${DIRNAME}${SPECFILE} | sed -e 's/^Version:\ \+//') ## ## create the tarball diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh new file mode 100755 index 0000000000..7d10d55ab4 --- /dev/null +++ b/packaging/RHEL-CTDB/makespec.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# +# Copyright (C) Michael Adam 2008 +# +# Script to determine the samba version and create the SPEC file from template + +DIRNAME=$(dirname $0) +TOPDIR=${DIRNAME}/../.. +SRCDIR=${TOPDIR}/source +VERSION_H=${SRCDIR}/include/version.h +SPECFILE=${DIRNAME}/samba.spec + +## +## determine the samba version and create the SPEC file +## +pushd ${SRCDIR} +./script/mkversion.sh +popd +if [ ! -f ${VERSION_H} ] ; then + echo "Error creating version.h" + exit 1 +fi + +VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'` +vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print +$3}'` +if test "x${vendor_version}" != "x" ; then + VERSION="${VERSION}-${vendor_version}" +fi +VERSION=`echo ${VERSION} | sed 's/-/_/g'` +VERSION=`echo ${VERSION} | sed 's/\"//g'` +echo "VERSION: ${VERSION}" +sed -e s/PVERSION/${VERSION}/g \ + < ${SPECFILE}.tmpl \ + > ${SPECFILE} + -- cgit From 0c9d433f9ec98471b52c2c65130602a393e8bbb0 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 15 Sep 2008 16:15:42 +0200 Subject: packaging(RHEL-CTDB): fix typo in makerpms.sh Michael (cherry picked from commit 5fc5e82d4c2c386894fde95f94992171620c7853) (cherry picked from commit 0e35ff0b46be2f9deab6e539c34970c85c3b58ce) --- packaging/RHEL-CTDB/makerpms.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh index c85b865f79..50fa96c2b1 100755 --- a/packaging/RHEL-CTDB/makerpms.sh +++ b/packaging/RHEL-CTDB/makerpms.sh @@ -53,8 +53,8 @@ if [ $RC -ne 0 ]; then exit ${RC} fi -RELEASE=$(grep ^Release ${DIRNAME}${SPECFILE} | sed -e 's/^Release:\ \+//') -VERSION=$(grep ^Version ${DIRNAME}${SPECFILE} | sed -e 's/^Version:\ \+//') +RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//') +VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//') ## ## create the tarball -- cgit From 0acddd96d92bd229650190f498b5782d1b96fac7 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 11 Nov 2008 13:45:40 +0100 Subject: packaging(RHEL-CTDB): add the cifs.upcall binary to the client package. Michael (cherry picked from commit 1875b373a319ac9494fdc907793e59804c577a4d) (cherry picked from commit e1dca5f1870975b7d9a57869357c971d559afdfe) --- packaging/RHEL-CTDB/samba.spec.tmpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 306ef34c3d..8df6becd94 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -417,6 +417,8 @@ exit 0 /sbin/mount.cifs /sbin/umount.cifs +%{_sbindir}/cifs.upcall + %{_bindir}/rpcclient %{_bindir}/smbcacls %{_bindir}/findsmb -- cgit From 9e4a95c928d023a3b253bbf7d9056aa91d5c278a Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 11 Nov 2008 13:47:37 +0100 Subject: packaging(RHEL-CTDB): move the cifs.upcall manpage to the client package Michael (cherry picked from commit 16f23eb27467ace9751ef2d1fbb6c4d3a5ae9550) (cherry picked from commit 9538e3130f33ffde1d68eaea303b2b2dd9ddd71d) --- packaging/RHEL-CTDB/samba.spec.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 8df6becd94..efcd2ed580 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -432,6 +432,7 @@ exit 0 %{_mandir}/man8/mount.cifs.8.* %{_mandir}/man8/umount.cifs.8.* +%{_mandir}/man8/cifs.upcall.8* %{_mandir}/man8/smbspool.8* %{_mandir}/man1/smbget.1* %{_mandir}/man5/smbgetrc.5* @@ -512,7 +513,6 @@ exit 0 %{_mandir}/man1/ldbedit.1* %{_mandir}/man1/ldbmodify.1* %{_mandir}/man1/ldbsearch.1* -%{_mandir}/man8/cifs.upcall.8* %ifarch i386 i486 i586 i686 ppc s390 %files winbind-32bit -- cgit From 05c9766cef9d0bba1b7ab496f06e976a6bcc2dae Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 1 Dec 2008 03:07:19 +0100 Subject: packaging(RHEL-CTDB): use ccache if available Michael (cherry picked from commit 36ca917a63f23126536e786bed845dee48fbf61c) (cherry picked from commit 05b51bc176f87e7dc1b65adf3d866e797159d953) --- packaging/RHEL-CTDB/samba.spec.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index efcd2ed580..f67cab68b9 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -133,12 +133,12 @@ cd source # RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" ## check for ccache -# ccache -h 2>&1 > /dev/null -#if [ $? -eq 0 ]; then -# CC="ccache gcc" -#else +ccache -h 2>&1 > /dev/null +if [ $? -eq 0 ]; then + CC="ccache gcc" +else CC="gcc" -#fi +fi ## always run autogen.sh ./autogen.sh -- cgit From 2ef0fc467a33e1b448853273316a72c3e7e72c47 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 1 Dec 2008 23:03:38 +0100 Subject: packaging(RHEL-CTDB): fix the build when ccache is not found. Michael (cherry picked from commit c98fb34ef933944a96a286d2d276cf2adc99e25e) (cherry picked from commit 7d929d9fa363a1f1c67926678524f338e84b3535) --- packaging/RHEL-CTDB/samba.spec.tmpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index f67cab68b9..e1eee81e45 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -133,8 +133,7 @@ cd source # RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" ## check for ccache -ccache -h 2>&1 > /dev/null -if [ $? -eq 0 ]; then +if ccache -h 2>&1 > /dev/null ; then CC="ccache gcc" else CC="gcc" -- cgit From dfff610b464cb08a07bf235c161c242d16684972 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 1 Dec 2008 23:19:02 +0100 Subject: packaging(RHEL-CTDB): don't show failure messages in check for ccache by fixing the order of "> /dev/null 2>&1" Michael (cherry picked from commit 0e9d5638a7c375b3b18f19f83f97924ab45ad382) (cherry picked from commit 6e51f250c5d38e973948aa1d53222bcccdcca365) --- packaging/RHEL-CTDB/samba.spec.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index e1eee81e45..8a583a9bde 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -133,7 +133,7 @@ cd source # RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" ## check for ccache -if ccache -h 2>&1 > /dev/null ; then +if ccache -h >/dev/null 2>&1 ; then CC="ccache gcc" else CC="gcc" -- cgit