linux-handhelds-2.6: Make override dirs consistent.

* Historically, latest kernel version used "linux-handhelds-2.6" override
dir, while older releases used "linux-handhelds-2.6-<ver>" dirs. This is
somewhat confusing and makes people look at wrong places. Make consistent.
* Also, drop old/broken subreleases, update cvs recipe.

diff --git a/packages/linux/linux-handhelds-2.6/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/asus620/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/asus620/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/asus620/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/asus730/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/asus730/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/asus730/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/aximx50/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/aximx50/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/aximx50/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/eteng500/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/eteng500/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/eteng500/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/h1910/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/h1910/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h1910/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/h2200/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h2200/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/h3600/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/h3600/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h3600/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/h3800/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/h3800/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h3800/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/h3900/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h3900/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/h4000/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h4000/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/h5000/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/h5000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/h5000/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcalpine/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcapache/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/htcapache/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcapache/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcbeetles/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htchimalaya/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcsable/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/htcsable/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcsable/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcwallaby/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/hx4700/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/looxc550/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/looxc550/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/looxc550/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/looxc550/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/magician/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/rx1950/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/rx1950/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/rx1950/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/rx1950/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig

diff --git a/packages/linux/linux-handhelds-2.6/rx3000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/rx3000/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6/rx3000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6/rx3000/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig

diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
deleted file mode 100644 (file)
index 2756027..0000000
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
-LICENSE = "GPL"
-PR = "r2"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://defconfig"
-
-require linux-handhelds-2.6.inc

diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
index ae3741e..a9dd604 100644 (file)
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
@@ -5,6 +5,10 @@ PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 

diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
index b34d463..cb6e7ef 100644 (file)
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
@@ -5,6 +5,10 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 

diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
deleted file mode 100644 (file)
index ae3741e..0000000
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
-LICENSE = "GPL"
-PR = "r3"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://defconfig"
-
-require linux-handhelds-2.6.inc

diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index b34d463..cb6e7ef 100644 (file)
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -5,6 +5,10 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 

diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index 4e008f5..89cb685 100644 (file)
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -6,10 +6,14 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "21"
-HHV     = "14"
+HHV     = "20"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"