Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .zfs-linux.metadata
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
a0a227d81af220a1d81a6d76b6279c942b4191d4 src/spl/spl-0.6.2.tar.gz
b1f67d1d18a3475f547ef180084a2cc10179fcd9 src/spl/spl-0.6.3.tar.gz
7b8315a6b92682058b0c316a4d16d3dbd4aee032 src/zfs/zfs-0.6.2.tar.gz
b699e611c726aebc3882fa3d8d9eab4101fa4911 src/zfs/zfs-0.6.3.tar.gz
e70261323b573f0379bc94a0fd9821212a8d6b0b src/spl/spl-0.6.3-1.2.tar.gz
14ddd75699a5690297f4d0381833f469b16b50f2 src/spl/spl-0.6.3-1.3.tar.gz
c8ddd2c9ecfde257cb8e99dbee19f242ca89c993 src/zfs/zfs-0.6.3-1.2.tar.gz
eefd4ee45b4f0fad4547e678cc948cbaf8bf0854 src/zfs/zfs-0.6.3-gcff8fdc3.tar.gz
3452393e2c9aaf4adcf332e3c97184373751bb11 src/zfs/zfs-0.6.3-1.3.tar.gz
2 changes: 2 additions & 0 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ https://github.com/rocksclusters-attic"
exit 1
fi

export SURL=http://forge.sdsc.edu/triton

. $ROLLSROOT/etc/bootstrap-functions.sh

if [ `./_os` == "linux" ]; then
Expand Down
8 changes: 4 additions & 4 deletions src/spl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@ TAR = /bin/tar
ARCH = $(shell /bin/uname -p)
REDHAT.ROOT = $(CURDIR)/../../


Makefile: zfs-version.mk

zfs-version.mk:
if [ -e ../../zfs-version.mk ]; then /bin/cp ../../zfs-version.mk .; fi


rpm pkg: RPMDIRS
gunzip -c $(NAME)-$(VERSION)$(RC)$(RELEASE).$(TARBALL_POSTFIX) | $(TAR) -xf -
gunzip -c $(NAME)-$(VERSION)$(RC)-$(RELEASE).$(TARBALL_POSTFIX) | $(TAR) -xf -
( \
cd $(NAME)-$(VERSION)$(RC)$(RELEASE); \
cd $(NAME)-$(NAME)-$(VERSION)$(RC)-$(RELEASE); \
./autogen.sh; \
./configure; \
$(MAKE) rpm; \
$(MAKE) rpms; \
/bin/cp *$(ARCH).rpm $(REDHAT.ROOT)/RPMS/$(ARCH); \
/bin/cp *src.rpm $(REDHAT.ROOT)/SRPMS; \
)
Expand Down
2 changes: 1 addition & 1 deletion src/spl/version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ include zfs-version.mk
NAME = spl
VERSION = $(SPL_VERSION)
RC =
RELEASE =
RELEASE = $(SPL_RELEASE)
TARBALL_POSTFIX = tar.gz
7 changes: 4 additions & 3 deletions src/zfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,12 @@ zfs-version.mk:
if [ -e ../../zfs-version.mk ]; then /bin/cp ../../zfs-version.mk .; fi

rpm pkg: RPMDIRS buildreqs
gunzip -c $(NAME)-$(VERSION)$(RC)$(RELEASE).$(TARBALL_POSTFIX) | $(TAR) -xf -
gunzip -c $(NAME)-$(VERSION)$(RC)-$(RELEASE).$(TARBALL_POSTFIX) | $(TAR) -xf -
( \
cd $(NAME)-$(VERSION)$(RC)$(RELEASE); \
cd $(NAME)-$(NAME)-$(VERSION)$(RC)-$(RELEASE); \
./autogen.sh; \
./configure; \
$(MAKE) rpm; \
$(MAKE) rpms; \
/bin/cp *$(ARCH).rpm $(REDHAT.ROOT)/RPMS/$(ARCH); \
/bin/cp *src.rpm $(REDHAT.ROOT)/SRPMS; \
)
Expand Down
2 changes: 1 addition & 1 deletion src/zfs/version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ include zfs-version.mk
NAME = zfs
VERSION = $(ZFS_VERSION)
RC =
RELEASE =
RELEASE = $(ZFS_RELEASE)
TARBALL_POSTFIX = tar.gz
2 changes: 2 additions & 0 deletions zfs-version.mk
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
ZFS_VERSION = 0.6.3
ZFS_RELEASE = 1.3
SPL_VERSION = 0.6.3
SPL_RELEASE = 1.3