main/zfs
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

The following changes were made:

Browse Source 
* Added REPO
  * usher now uses /bin/sh
  * Removed TARGET from usher
  * moved modules to /lib/modules/zfs
This commit is contained in:
Jay Larson
2018-04-06 15:28:30 -05:00
parent 0c6f5455b8
commit a9b9d9825b
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -9,13 +9,14 @@
# GNU General Public License for more details. # GNU General Public License for more details.
export SRCPKG = zfs export SRCPKG = zfs
export DEPENDS = glibc,libzfs,util-linux,zlib export DEPENDS = glibc,libzfs,util-linux,spl,zlib
export ARCH = x86_64 export ARCH = x86_64
export URL = http://zfsonlinux.org/ export URL = http://zfsonlinux.org/
REPO = main
BRIEF = Module and utilities for the ZFS file system BRIEF = Module and utilities for the ZFS file system
DESC = ZFS is an advanced file system and volume manager which was originally \ DESC = ZFS is an advanced file system and volume manager which was originally \
developed for Solaris and is now maintained by the Illumos community. developed for Solaris and is now maintained by the Illumos community.
SNAPVER = 5 SNAPVER = 7
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -78,7 +79,10 @@ $(ROOT): $(SRCDIR)/module/zfs/zfs.ko
@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
mv $(ROOT)/etc/default/zfs $(ROOT)/usr/share/zfs/zfs.default && \ mv $(ROOT)/etc/default/zfs $(ROOT)/usr/share/zfs/zfs.default && \
rmdir $(ROOT)/etc/default && \ rmdir $(ROOT)/etc/default && \
install -v -d -m 755 $(ROOT)/etc/zfs install -v -d -m 755 $(ROOT)/etc/zfs && \
install -v -d -m 755 $(ROOT)/lib/modules/$(PACKAGE) && \
mv -v $(ROOT)/lib/modules/*/* $(ROOT)/lib/modules/$(PACKAGE) && \
rm -vrf $(ROOT)/usr/share/initramfs-tools
@install -v -d $(LIB)/SNAP && \ @install -v -d $(LIB)/SNAP && \
install -v -d $(LIBROOT) && \ install -v -d $(LIBROOT) && \

1
Makefile.libzfs
View File

@@ -11,5 +11,6 @@
DEPENDS = glibc,util-linux,zlib DEPENDS = glibc,util-linux,zlib
BRIEF = Runtime library for ZFS BRIEF = Runtime library for ZFS
DESC = Runtime library for ZFS DESC = Runtime library for ZFS
REPO = main
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux

1
Makefile.zfs-dev
View File

@@ -11,5 +11,6 @@
DEPENDS = libzfs DEPENDS = libzfs
BRIEF = Development files for ZFS BRIEF = Development files for ZFS
DESC = Development files for ZFS DESC = Development files for ZFS
REPO = dev
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux

17
SNAP/usher
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
set -e set -e
@@ -7,15 +7,18 @@ case $1 in
exit 0 exit 0
;; ;;
postinst) postinst)
if [ ! -f ${TARGET}/etc/default/zfs ]; then if [ ! -f /etc/default/zfs ]; then
cp ${TARGET}/usr/share/zfs/zfs.default /etc/default/zfs cp /usr/share/zfs/zfs.default /etc/default/zfs
fi fi
if [[ ${TARGET} ]]; then if [ ! -f /usr/share/mkinitramfs/mods/zfs ]; then
chroot ${TARGET} depmod cp /usr/share/zfs/zfs.mods /usr/share/mkinitramfs/mods/zfs
else
depmod
fi fi
if [ ! -f /usr/share/mkinitramfs/bins/zfs ]; then
cp /usr/share/zfs/zfs.bins /usr/share/mkinitramfs/bins/zfs
fi
depmod
;; ;;
prerm) prerm)
exit 0 exit 0