diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-12-06 14:33:51 -0500 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-12-06 15:31:54 -0800 |
| commit | f4488e34553ec0bf68c270034af179ab14fd2b58 (patch) | |
| tree | edef87f40737519c3afd15bdd21e6f08fc9009f9 | |
| parent | 39dd3b21c59380fb5f4dcae59ebd4f8e000cfa98 (diff) | |
build: FedoraSCM sources are not longer needed to build RPMs
Also some updates to .gitignore
Change-Id: I576af453ca7d1ec1f3db21ee4d8386927988e7db
BUG: 950083
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/6458
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | extras/LinuxRPM/Makefile.am | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index ff253c1da..1649aa6fb 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ extras/init.d/glusterd-Debian extras/init.d/glusterd-Redhat extras/init.d/glusterd-SuSE extras/init.d/glusterd.plist +extras/systemd/glusterd.service extras/ocf/glusterd extras/ocf/volume extras/who-wrote-glusterfs/gitdm @@ -40,9 +41,10 @@ libgfchangelog.pc libglusterfs/src/spec.lex.c libglusterfs/src/y.tab.c libglusterfs/src/y.tab.h +libglusterfs/src/gf-error-codes.h libtool run-tests.sh -ufo/.tox -ufo/test/unit/.coverage xlators/mount/fuse/utils/mount.glusterfs xlators/mount/fuse/utils/mount_glusterfs +geo-replication/src/peer_add_secret_pub +geo-replication/src/peer_gsec_create diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index 1dafa982b..593f850ac 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -18,18 +18,8 @@ prep: -mkdir -p rpmbuild/SPECS -mkdir -p rpmbuild/RPMS -mkdir -p rpmbuild/SRPMS - -rm -rf rpmbuild/SOURCES - @if [ -d /d/cache/glusterfs -a -e /d/cache/glusterfs/sources ]; then \ - echo "copying glusterfs rpm files from local cache..." ; \ - mkdir -p ./rpmbuild/SOURCES; \ - cp /d/cache/glusterfs/* ./rpmbuild/SOURCES/ ; \ - elif [ -x /usr/bin/git ]; then \ - echo "fetching glusterfs rpm files from fedora git repo..."; \ - cd ./rpmbuild && git clone git://pkgs.fedoraproject.org/glusterfs.git > /dev/null && mv glusterfs SOURCES; \ - else \ - echo "glusterfs rpm files not fetched, you don't have git installed!" ; \ - exit 1 ; \ - fi + -mkdir -p rpmbuild/SOURCES + -rm -rf rpmbuild/SOURCES/* cp ../../*.tar.gz ./rpmbuild/SOURCES cp ../../glusterfs.spec ./rpmbuild/SPECS |