diff options
| author | alive4ever | 2016-08-23 05:43:03 +0700 |
|---|---|---|
| committer | alive4ever | 2016-08-23 05:43:03 +0700 |
| commit | 69a78b77c4c3242d11ffad26c9d23b6bb987bc25 (patch) | |
| tree | 744de28530e9a19c0cd3c6b3291a668a12f5fa64 | |
| parent | 40203921c8c1557bd25c65502d18df284889b7b0 (diff) | |
| download | aur-69a78b77c4c3242d11ffad26c9d23b6bb987bc25.tar.gz | |
Remove checkinstall function from maynard launch script
checkinstall() contains reference to build directory (ABS_BUILD). I
think it's safe to remove it since makepkg doesn't forget to `make
install` the package. Removing this function silences makepkg warning
about reference to PKGBUILD.
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | 01-maynard.patch | 21 | ||||
| -rw-r--r-- | PKGBUILD | 2 |
4 files changed, 21 insertions, 5 deletions
@@ -17,7 +17,7 @@ pkgbase = maynard-git source = maynard::git+https://github.com/raspberrypi/maynard.git source = 01-maynard.patch sha256sums = SKIP - sha256sums = 07fb68ed8dcebca0ec9272ac0707b622a5c599e12ab0360947d031a572fff35c + sha256sums = 939a16eb6b50343059f7bb0afa89eff9831ae67ea561101620e7dab009883f60 pkgname = maynard-git diff --git a/.gitignore b/.gitignore index e903f1bf2bc8..29097ca42747 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ maynard-git* +maynard pkg src diff --git a/01-maynard.patch b/01-maynard.patch index 822331c8711d..ffbb278bd4a3 100644 --- a/01-maynard.patch +++ b/01-maynard.patch @@ -2,15 +2,30 @@ Index: b/maynard.in =================================================================== --- a/maynard.in +++ b/maynard.in -@@ -1,9 +1,9 @@ +@@ -1,25 +1,12 @@ #! /bin/sh PREFIX=@prefix@ -LIBEXECDIR=$PREFIX/libexec -+LIBEXECDIR=@libexecdir@ - ABS_BUILDDIR=@abs_builddir@ +-ABS_BUILDDIR=@abs_builddir@ -DEFAULT_BACKGROUND=/usr/share/wallpapers/Hanami/contents/images/3872x2592.jpg +DEFAULT_BACKGROUND=/usr/share/weston/background.png md5() { cat "$1" 2> /dev/null | md5sum + } + +-check_install() { +- local_maynard="$ABS_BUILDDIR/shell/maynard" +- installed_maynard="$LIBEXECDIR/maynard" +- if [ ! -e "$local_maynard" -o \ +- ! -e "$installed_maynard" -o \ +- "`md5 \"$local_maynard\"`" != "`md5 \"$installed_maynard\"`" ]; then +- echo "It looks like you forgot to run 'make install'." >&2 +- exit 1 +- fi +-} +- + mkdir ~/.config > /dev/null 2>&1 + + if [ -z "${MAYNARD_BACKGROUND+_}" -a \ @@ -13,7 +13,7 @@ install=maynard.install source=("${pkgname%-git}::git+https://github.com/raspberrypi/maynard.git" "01-maynard.patch") sha256sums=('SKIP' - '07fb68ed8dcebca0ec9272ac0707b622a5c599e12ab0360947d031a572fff35c') + '939a16eb6b50343059f7bb0afa89eff9831ae67ea561101620e7dab009883f60') pkgver() { cd "$srcdir/${pkgname%-git}" |