aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2010-10-07 11:04:16 +0300
committerJouni Malinen <j@w1.fi>2010-10-07 11:04:16 +0300
commit01cf713e51283a114039544fab920ae7116c7c24 (patch)
treeb359eedd1c8e02385f7e4475427c43cf2184ca18
parentbf0ed63f3fa3e026370b518a4d7f574244f3c660 (diff)
downloadexternal_wpa_supplicant_8_ti-01cf713e51283a114039544fab920ae7116c7c24.zip
external_wpa_supplicant_8_ti-01cf713e51283a114039544fab920ae7116c7c24.tar.gz
external_wpa_supplicant_8_ti-01cf713e51283a114039544fab920ae7116c7c24.tar.bz2
Fix .gitignore files to not ignore subdirectory matches
The previous used .gitignore files were mathing some files that were actually already in the repository (e.g., hostapd/logwatch/hostapd). Avoid this by listing the conflicting entries in the root directory .gitignore with full path.
-rw-r--r--.gitignore14
-rw-r--r--hostapd/.gitignore7
-rw-r--r--wpa_supplicant/.gitignore7
-rw-r--r--wpa_supplicant/wpa_gui-qt4/.gitignore2
-rw-r--r--wpa_supplicant/wpa_gui/.gitignore2
5 files changed, 14 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index f533957..4a1ad86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
*.o
*.d
*~
+wpa_supplicant/eapol_test
+wpa_supplicant/preauth_test
+wpa_supplicant/wpa_cli
+wpa_supplicant/wpa_passphrase
+wpa_supplicant/wpa_supplicant
+wpa_supplicant/wpa_priv
+wpa_supplicant/wpa_gui/Makefile
+wpa_supplicant/wpa_gui/wpa_gui
+wpa_supplicant/wpa_gui-qt4/Makefile
+wpa_supplicant/wpa_gui-qt4/wpa_gui
+hostapd/hostapd
+hostapd/hostapd_cli
+hostapd/hlr_auc_gw
+hostapd/nt_password_hash
diff --git a/hostapd/.gitignore b/hostapd/.gitignore
deleted file mode 100644
index 6dd2c2f..0000000
--- a/hostapd/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.d
-.config
-driver_conf.c
-hostapd
-hostapd_cli
-hlr_auc_gw
-nt_password_hash
diff --git a/wpa_supplicant/.gitignore b/wpa_supplicant/.gitignore
index e7e034c..1f89d9f 100644
--- a/wpa_supplicant/.gitignore
+++ b/wpa_supplicant/.gitignore
@@ -1,8 +1 @@
-*.d
.config
-eapol_test
-preauth_test
-wpa_cli
-wpa_passphrase
-wpa_supplicant
-wpa_priv
diff --git a/wpa_supplicant/wpa_gui-qt4/.gitignore b/wpa_supplicant/wpa_gui-qt4/.gitignore
index efcb666..da818cb 100644
--- a/wpa_supplicant/wpa_gui-qt4/.gitignore
+++ b/wpa_supplicant/wpa_gui-qt4/.gitignore
@@ -1,6 +1,4 @@
.moc
.obj
.ui
-Makefile
-wpa_gui
qrc_icons.cpp
diff --git a/wpa_supplicant/wpa_gui/.gitignore b/wpa_supplicant/wpa_gui/.gitignore
index 11963c8..4df64a9 100644
--- a/wpa_supplicant/wpa_gui/.gitignore
+++ b/wpa_supplicant/wpa_gui/.gitignore
@@ -1,5 +1,3 @@
.moc
.obj
.ui
-Makefile
-wpa_gui