diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-04-20 03:39:27 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-04-20 03:39:27 +0000 |
| commit | 9a2ff063f6ba0dcec5b6a40e3a6cccc04fcceed3 (patch) | |
| tree | 4a2365a18cfc123567f122dbb0510795ca4341ba /testing/linux-scst/setlocalversion.patch | |
| parent | 3a40028e50c4e6ab82135d469de4ae8ccb32f7d3 (diff) | |
| parent | 983a11e3031ce51a0c7b0ded0d48713d48474522 (diff) | |
| download | aports-9a2ff063f6ba0dcec5b6a40e3a6cccc04fcceed3.tar.bz2 aports-9a2ff063f6ba0dcec5b6a40e3a6cccc04fcceed3.tar.xz | |
Merge remote-tracking branch 'alpine/master'
Conflicts:
main/libxft/APKBUILD
main/ncftp/APKBUILD
main/spandsp/APKBUILD
testing/openvcp/APKBUILD
Diffstat (limited to 'testing/linux-scst/setlocalversion.patch')
| -rw-r--r-- | testing/linux-scst/setlocalversion.patch | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/testing/linux-scst/setlocalversion.patch b/testing/linux-scst/setlocalversion.patch deleted file mode 100644 index d82eb170a..000000000 --- a/testing/linux-scst/setlocalversion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./scripts/setlocalversion.orig -+++ ./scripts/setlocalversion -@@ -43,7 +43,7 @@ - fi - - # Check for git and a git repo. -- if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then -+ if [ -d "$srctree"/.git ] && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then - - # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore - # it, because this version is defined in the top level Makefile. |