From 9163845c19add4bc88cd194780641f8dbcfec942 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Tue, 27 Mar 2018 09:24:25 -0500 Subject: [PATCH] The following changes were made: * Added REPO * Moved usher from bash to /bin/sh * Removed TARGET from usher --- Makefile | 3 ++- SNAP/usher | 12 +++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c16ca48..eb7bed6 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,12 @@ DEPENDS = glibc ARCH = x86_64 URL = http://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/about/ +REPO = core BRIEF = Kernel module tools DESC = kmod is a set of tools to handle common tasks with Linux kernel \ modules like insert, remove, list, check properties, resolve dependencies \ and aliases. -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') diff --git a/SNAP/usher b/SNAP/usher index 4fdbd07..7d10fd2 100755 --- a/SNAP/usher +++ b/SNAP/usher @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e @@ -7,14 +7,12 @@ case $1 in exit 0 ;; postinst) - if [ ! -f ${TARGET}/etc/modprobe.d/blacklist.conf ]; then - cp ${TARGET}/usr/share/kmod/blacklist.conf \ - ${TARGET}/etc/modprobe.d/blacklist.conf + if [ ! -f /etc/modprobe.d/blacklist.conf ]; then + cp /usr/share/kmod/blacklist.conf /etc/modprobe.d/blacklist.conf fi - if [ ! -f ${TARGET}/etc/modprobe.d/usb.conf ]; then - cp ${TARGET}/usr/share/kmod/usb.conf \ - ${TARGET}/etc/modprobe.d/usb.conf + if [ ! -f /etc/modprobe.d/usb.conf ]; then + cp /usr/share/kmod/usb.conf /etc/modprobe.d/usb.conf fi ;; prerm)