From 0b8e66fec43082c274bd482ad267052a16aeccad Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Fri, 6 Apr 2018 13:25:49 -0500 Subject: [PATCH] The following changes were made: * Added REPO * usher now uses /bin/sh * Removed TARGET from usher --- Makefile | 9 +++++++-- Makefile.spl-dev | 1 + SNAP/usher | 8 ++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 49d0425..7c3a4fc 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,13 @@ export SRCPKG = spl export DEPENDS = glibc +export BUILDDEPS = gcc export ARCH = x86_64 export URL = http://zfsonlinux.org/ +REPO = main +BRIEF = Interface for OpenZFS DESC = A shim layer which adds the core interfaces required for OpenZFS -SNAPVER = 3 +SNAPVER = 4 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -69,7 +72,9 @@ $(ROOT): $(SRCDIR)/module/spl/spl.ko mkdir -v $(ROOT); \ fi - @cd $(SRCDIR) && make install DESTDIR=$(ROOT) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + install -v -d -m 755 $(ROOT)/lib/modules/$(PACKAGE) && \ + mv $(ROOT)/lib/modules/*/* $(ROOT)/lib/modules/$(PACKAGE) @install -d -v $(DEV)/SNAP && \ install -d -v $(DEVROOT)/usr && \ diff --git a/Makefile.spl-dev b/Makefile.spl-dev index 326dc72..0fc9522 100644 --- a/Makefile.spl-dev +++ b/Makefile.spl-dev @@ -9,6 +9,7 @@ # GNU General Public License for more details. DEPENDS = spl +REPO = dev BRIEF = Development files for spl DESC = Development files for spl diff --git a/SNAP/usher b/SNAP/usher index f1fbfc8..3633ce4 100755 --- a/SNAP/usher +++ b/SNAP/usher @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e @@ -7,11 +7,7 @@ case $1 in exit 0 ;; postinst) - if [[ ${TARGET} ]]; then - chroot ${TARGET} depmod - else - depmod - fi + depmod ;; prerm) exit 0