* [PATCH 0/3] compat-wireless: some updates to scripts
@ 2011-01-09 15:32 Hauke Mehrtens
2011-01-09 15:32 ` [PATCH 1/3] compat-wireless: make NEXT_TREE configurable Hauke Mehrtens
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2011-01-09 15:32 UTC (permalink / raw)
To: mcgrof; +Cc: linux-wireless, Hauke Mehrtens
The following commit should also go into stable comat-wireless:
184c55e4c41b95c01ea5e4152c613b5c79e44466
[PATCH 1/3] compat-wireless: make NEXT_TREE configurable.
Hauke Mehrtens (3):
compat-wireless: make NEXT_TREE configurable.
compat-wireless: update patches in enable-older-kernels
compat-wireless: do not write git-clone
enable-older-kernels/enable-2.6.21.patch | 26 +++++++++++++-------------
enable-older-kernels/enable-2.6.22.patch | 26 +++++++++++++-------------
enable-older-kernels/enable-2.6.23.patch | 20 +++++++++-----------
enable-older-kernels/enable-2.6.24.patch | 28 ----------------------------
scripts/admin-update.sh | 26 +++++++++++++++++++-------
5 files changed, 54 insertions(+), 72 deletions(-)
delete mode 100644 enable-older-kernels/enable-2.6.24.patch
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] compat-wireless: make NEXT_TREE configurable.
2011-01-09 15:32 [PATCH 0/3] compat-wireless: some updates to scripts Hauke Mehrtens
@ 2011-01-09 15:32 ` Hauke Mehrtens
2011-01-09 15:32 ` [PATCH 2/3] compat-wireless: update patches in enable-older-kernels Hauke Mehrtens
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2011-01-09 15:32 UTC (permalink / raw)
To: mcgrof; +Cc: linux-wireless, Hauke Mehrtens
It was assumed that the linux next tree is at ~/linux-next . Now the
directory can be set with NEXT_TREE like the other variables.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
This should also go into stable.
scripts/admin-update.sh | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index f23c33c..bf8e080 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -426,6 +426,23 @@ export WSTABLE="
# Stable pending, if -n was passed
if [[ "$GET_STABLE_PENDING" = y ]]; then
+
+ if [ -z $NEXT_TREE ]; then
+ NEXT_TREE="/home/$USER/linux-next/"
+ if [ ! -d $NEXT_TREE ]; then
+ echo "Please tell me where your linux-next git tree is."
+ echo "You can do this by exporting its location as follows:"
+ echo
+ echo " export NEXT_TREE=/home/$USER/linux-next/"
+ echo
+ echo "If you do not have one you can clone the repository:"
+ echo " git clone git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
+ exit 1
+ fi
+ else
+ echo "You said to use git tree at: $NEXT_TREE for linux-next"
+ fi
+
LAST_DIR=$PWD
cd $GIT_TREE
if [ -f localversion* ]; then
@@ -436,11 +453,6 @@ if [[ "$GET_STABLE_PENDING" = y ]]; then
# we now assume you are using a stable tree
cd $GIT_TREE
LAST_STABLE_UPDATE=$(git describe --abbrev=0)
- NEXT_TREE="/home/$USER/linux-next/"
- if [ ! -d $NEXT_TREE ]; then
- echo -e "You are expected to have $NEXT_TREE directory when using -s"
- exit 1
- fi
cd $NEXT_TREE
PENDING_STABLE_DIR="pending-stable/"
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] compat-wireless: update patches in enable-older-kernels
2011-01-09 15:32 [PATCH 0/3] compat-wireless: some updates to scripts Hauke Mehrtens
2011-01-09 15:32 ` [PATCH 1/3] compat-wireless: make NEXT_TREE configurable Hauke Mehrtens
@ 2011-01-09 15:32 ` Hauke Mehrtens
2011-01-09 15:32 ` [PATCH 3/3] compat-wireless: do not write git-clone Hauke Mehrtens
2011-01-13 0:59 ` [PATCH 0/3] compat-wireless: some updates to scripts Luis R. Rodriguez
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2011-01-09 15:32 UTC (permalink / raw)
To: mcgrof; +Cc: linux-wireless, Hauke Mehrtens
* enable-2.6.24.patch does not make any sense as we already support kernel 2.6.24
* Update the other patches to apply again.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
enable-older-kernels/enable-2.6.21.patch | 26 +++++++++++++-------------
enable-older-kernels/enable-2.6.22.patch | 26 +++++++++++++-------------
enable-older-kernels/enable-2.6.23.patch | 20 +++++++++-----------
enable-older-kernels/enable-2.6.24.patch | 28 ----------------------------
4 files changed, 35 insertions(+), 65 deletions(-)
delete mode 100644 enable-older-kernels/enable-2.6.24.patch
diff --git a/enable-older-kernels/enable-2.6.21.patch b/enable-older-kernels/enable-2.6.21.patch
index bb6e33d..2c16809 100644
--- a/enable-older-kernels/enable-2.6.21.patch
+++ b/enable-older-kernels/enable-2.6.21.patch
@@ -1,26 +1,26 @@
---- a/config.mk 2010-01-11 10:27:53.000000000 -0800
-+++ b/config.mk 2010-01-11 10:32:49.000000000 -0800
-@@ -26,8 +26,8 @@
+--- a/config.mk
++++ b/config.mk
+@@ -25,9 +25,9 @@
COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y))
--ifdef CONFIG_COMPAT_KERNEL_25
--$(error "ERROR: compat-wireless by default supports kernels >= 2.6.25, try enabling only one driver though")
-+ifdef CONFIG_COMPAT_WIRELESS_21
-+$(error "ERROR: compat-wireless for selected driver requires a kernel >= 2.6.21")
- endif
+-ifdef CONFIG_COMPAT_KERNEL_24
+-$(error "ERROR: compat-wireless by default supports kernels >= 2.6.24, try enabling only one driver though")
+-endif #CONFIG_COMPAT_KERNEL_24
++ifdef CONFIG_COMPAT_KERNEL_21
++$(error "ERROR: compat-wireless by default supports kernels >= 2.6.21, try enabling only one driver though")
++endif #CONFIG_COMPAT_KERNEL_21
ifeq ($(CONFIG_CFG80211),y)
-diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh
-index 6c7cae7..bb2ea6d 100755
+ $(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.")
--- a/scripts/gen-compat-autoconf.sh
+++ b/scripts/gen-compat-autoconf.sh
@@ -11,7 +11,7 @@
# This indicates which is the oldest kernel we support
# Update this if you are adding support for older kernels.
--OLDEST_KERNEL_SUPPORTED="2.6.25"
+-OLDEST_KERNEL_SUPPORTED="2.6.24"
+OLDEST_KERNEL_SUPPORTED="2.6.21"
- COMPAT_RELEASE="compat-release"
- KERNEL_RELEASE="git-describe"
+ COMPAT_RELEASE="compat_version"
+ KERNEL_RELEASE="compat_base_tree_version"
MULT_DEP_FILE=".compat_pivot_dep"
diff --git a/enable-older-kernels/enable-2.6.22.patch b/enable-older-kernels/enable-2.6.22.patch
index 3acfcec..92150e9 100644
--- a/enable-older-kernels/enable-2.6.22.patch
+++ b/enable-older-kernels/enable-2.6.22.patch
@@ -1,26 +1,26 @@
---- a/config.mk 2010-01-11 10:27:53.000000000 -0800
-+++ b/config.mk 2010-01-11 10:32:49.000000000 -0800
-@@ -26,8 +26,8 @@
+--- a/config.mk
++++ b/config.mk
+@@ -25,9 +25,9 @@
COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y))
--ifdef CONFIG_COMPAT_KERNEL_25
--$(error "ERROR: compat-wireless by default supports kernels >= 2.6.25, try enabling only one driver though")
-+ifdef CONFIG_COMPAT_WIRELESS_22
-+$(error "ERROR: compat-wireless for selected driver requires a kernel >= 2.6.22")
- endif
+-ifdef CONFIG_COMPAT_KERNEL_24
+-$(error "ERROR: compat-wireless by default supports kernels >= 2.6.24, try enabling only one driver though")
+-endif #CONFIG_COMPAT_KERNEL_24
++ifdef CONFIG_COMPAT_KERNEL_22
++$(error "ERROR: compat-wireless by default supports kernels >= 2.6.22, try enabling only one driver though")
++endif #CONFIG_COMPAT_KERNEL_22
ifeq ($(CONFIG_CFG80211),y)
-diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh
-index 6c7cae7..bb2ea6d 100755
+ $(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.")
--- a/scripts/gen-compat-autoconf.sh
+++ b/scripts/gen-compat-autoconf.sh
@@ -11,7 +11,7 @@
# This indicates which is the oldest kernel we support
# Update this if you are adding support for older kernels.
--OLDEST_KERNEL_SUPPORTED="2.6.25"
+-OLDEST_KERNEL_SUPPORTED="2.6.24"
+OLDEST_KERNEL_SUPPORTED="2.6.22"
- COMPAT_RELEASE="compat-release"
- KERNEL_RELEASE="git-describe"
+ COMPAT_RELEASE="compat_version"
+ KERNEL_RELEASE="compat_base_tree_version"
MULT_DEP_FILE=".compat_pivot_dep"
diff --git a/enable-older-kernels/enable-2.6.23.patch b/enable-older-kernels/enable-2.6.23.patch
index 948d249..6266c17 100644
--- a/enable-older-kernels/enable-2.6.23.patch
+++ b/enable-older-kernels/enable-2.6.23.patch
@@ -1,27 +1,25 @@
-diff --git a/config.mk b/config.mk
-index 777ebd3..2ad11fc 100644
--- a/config.mk
+++ b/config.mk
-@@ -25,8 +25,8 @@ KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2
+@@ -25,9 +25,9 @@
COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y))
--ifdef CONFIG_COMPAT_KERNEL_25
--$(error "ERROR: compat-wireless by default supports kernels >= 2.6.25, try enabling only one driver though")
-+ifdef CONFIG_COMPAT_WIRELESS_23
-+$(error "ERROR: compat-wireless for selected driver requires a kernel >= 2.6.23")
- endif
+-ifdef CONFIG_COMPAT_KERNEL_24
+-$(error "ERROR: compat-wireless by default supports kernels >= 2.6.24, try enabling only one driver though")
+-endif #CONFIG_COMPAT_KERNEL_24
++ifdef CONFIG_COMPAT_KERNEL_23
++$(error "ERROR: compat-wireless by default supports kernels >= 2.6.23, try enabling only one driver though")
++endif #CONFIG_COMPAT_KERNEL_23
ifeq ($(CONFIG_CFG80211),y)
-diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh
-index 1e3002e..64dac69 100755
+ $(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.")
--- a/scripts/gen-compat-autoconf.sh
+++ b/scripts/gen-compat-autoconf.sh
@@ -11,7 +11,7 @@
# This indicates which is the oldest kernel we support
# Update this if you are adding support for older kernels.
--OLDEST_KERNEL_SUPPORTED="2.6.25"
+-OLDEST_KERNEL_SUPPORTED="2.6.24"
+OLDEST_KERNEL_SUPPORTED="2.6.23"
COMPAT_RELEASE="compat_version"
KERNEL_RELEASE="compat_base_tree_version"
diff --git a/enable-older-kernels/enable-2.6.24.patch b/enable-older-kernels/enable-2.6.24.patch
deleted file mode 100644
index e1e0cfc..0000000
--- a/enable-older-kernels/enable-2.6.24.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/config.mk b/config.mk
-index 777ebd3..2ad11fc 100644
---- a/config.mk
-+++ b/config.mk
-@@ -25,8 +25,8 @@ KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2
- COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
- $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y))
-
--ifdef CONFIG_COMPAT_KERNEL_25
--$(error "ERROR: compat-wireless by default supports kernels >= 2.6.25, try enabling only one driver though")
-+ifdef CONFIG_COMPAT_WIRELESS_24
-+$(error "ERROR: compat-wireless for selected driver requires a kernel >= 2.6.24")
- endif
-
- ifeq ($(CONFIG_CFG80211),y)
-diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh
-index 1e3002e..0f0e415 100755
---- a/scripts/gen-compat-autoconf.sh
-+++ b/scripts/gen-compat-autoconf.sh
-@@ -11,7 +11,7 @@
-
- # This indicates which is the oldest kernel we support
- # Update this if you are adding support for older kernels.
--OLDEST_KERNEL_SUPPORTED="2.6.25"
-+OLDEST_KERNEL_SUPPORTED="2.6.24"
- COMPAT_RELEASE="compat_version"
- KERNEL_RELEASE="compat_base_tree_version"
- MULT_DEP_FILE=".compat_pivot_dep"
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] compat-wireless: do not write git-clone
2011-01-09 15:32 [PATCH 0/3] compat-wireless: some updates to scripts Hauke Mehrtens
2011-01-09 15:32 ` [PATCH 1/3] compat-wireless: make NEXT_TREE configurable Hauke Mehrtens
2011-01-09 15:32 ` [PATCH 2/3] compat-wireless: update patches in enable-older-kernels Hauke Mehrtens
@ 2011-01-09 15:32 ` Hauke Mehrtens
2011-01-13 0:59 ` [PATCH 0/3] compat-wireless: some updates to scripts Luis R. Rodriguez
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2011-01-09 15:32 UTC (permalink / raw)
To: mcgrof; +Cc: linux-wireless, Hauke Mehrtens
the command git-clone was removed and git clone should be used now.
Update error message.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
scripts/admin-update.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index bf8e080..650c489 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -191,7 +191,7 @@ if [ -z $GIT_TREE ]; then
echo " export GIT_TREE=/home/$USER/linux-next/"
echo
echo "If you do not have one you can clone the repository:"
- echo " git-clone $GIT_URL"
+ echo " git clone $GIT_URL"
exit 1
fi
else
@@ -207,7 +207,7 @@ if [ -z $GIT_COMPAT_TREE ]; then
echo " export GIT_COMPAT_TREE=/home/$USER/compat/"
echo
echo "If you do not have one you can clone the repository:"
- echo " git-clone $GIT_COMPAT_URL"
+ echo " git clone $GIT_COMPAT_URL"
exit 1
fi
else
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] compat-wireless: some updates to scripts
2011-01-09 15:32 [PATCH 0/3] compat-wireless: some updates to scripts Hauke Mehrtens
` (2 preceding siblings ...)
2011-01-09 15:32 ` [PATCH 3/3] compat-wireless: do not write git-clone Hauke Mehrtens
@ 2011-01-13 0:59 ` Luis R. Rodriguez
3 siblings, 0 replies; 5+ messages in thread
From: Luis R. Rodriguez @ 2011-01-13 0:59 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless
On Sun, Jan 9, 2011 at 7:32 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> The following commit should also go into stable comat-wireless:
> 184c55e4c41b95c01ea5e4152c613b5c79e44466
> [PATCH 1/3] compat-wireless: make NEXT_TREE configurable.
>
> Hauke Mehrtens (3):
> compat-wireless: make NEXT_TREE configurable.
> compat-wireless: update patches in enable-older-kernels
> compat-wireless: do not write git-clone
Thanks! Applied all 3 and pushed.
Luis
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-13 0:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-09 15:32 [PATCH 0/3] compat-wireless: some updates to scripts Hauke Mehrtens
2011-01-09 15:32 ` [PATCH 1/3] compat-wireless: make NEXT_TREE configurable Hauke Mehrtens
2011-01-09 15:32 ` [PATCH 2/3] compat-wireless: update patches in enable-older-kernels Hauke Mehrtens
2011-01-09 15:32 ` [PATCH 3/3] compat-wireless: do not write git-clone Hauke Mehrtens
2011-01-13 0:59 ` [PATCH 0/3] compat-wireless: some updates to scripts Luis R. Rodriguez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.