summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-wireless/iw/files/iw-3.10-versioncheck.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-wireless/iw/files/iw-3.10-versioncheck.patch')
-rw-r--r--net-wireless/iw/files/iw-3.10-versioncheck.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/net-wireless/iw/files/iw-3.10-versioncheck.patch b/net-wireless/iw/files/iw-3.10-versioncheck.patch
new file mode 100644
index 000000000000..a15931f5865f
--- /dev/null
+++ b/net-wireless/iw/files/iw-3.10-versioncheck.patch
@@ -0,0 +1,30 @@
+From 2b60b435dd032572c556b064295a3e3607d00a55 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <fschmaus@gmail.com>
+Date: Sun, 1 Sep 2013 17:57:21 +0200
+Subject: [PATCH] Don't get iw version from git if there is no .git/
+
+The version.sh script should only try to get the version from git if the
+source actually resides in a git repository, i.e. .git/ exists. Doing
+otherwise in a non-git source repo results in git ascending until it
+finds a .git directory, which will cause problems in some source-based
+distributions ( https://bugs.gentoo.org/show_bug.cgi?id=482334 ).
+---
+ version.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/version.sh b/version.sh
+index 80e55ab..0f1aa1d 100755
+--- a/version.sh
++++ b/version.sh
+@@ -3,7 +3,7 @@
+ VERSION="3.11"
+ OUT="$1"
+
+-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
+ git update-index --refresh --unmerged > /dev/null
+ descr=$(git describe)
+
+--
+1.8.1.5
+