summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2009-12-03 12:38:37 +0100
committerTreeve Jelbert2009-12-03 12:38:37 +0100
commitd191e5a90128f3a259e09fdb0a20634453401e18 (patch)
tree6413406fe58d051afc145d69829fe1b008015f2c
parent27ace2340e275a51d19efb2a7b101f1d0607b990 (diff)
parent62c8c047728306940c0d6569b26fdfa93d99f215 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xdevel/git/DETAILS2
-rw-r--r--devel/git/HISTORY3
-rw-r--r--kernels/linux/HISTORY6
-rwxr-xr-xkernels/linux/info/kernels/2.6.323
-rwxr-xr-xkernels/linux/info/patches/PRE_2_6/patch-2.6.325
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches/patch-2.6.325
-rw-r--r--kernels/linux/latest.defaults6
7 files changed, 26 insertions, 4 deletions
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index deff014ac4..25cb11fea9 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
SPELL=git
- VERSION=1.6.5.3
+ VERSION=1.6.5.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 5e121f8d5c..6bc68a6e29 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2009-12-03 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.6.5.4
+
2009-11-17 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.6.5.3
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9a194758f8..b85832fc1a 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,9 @@
+2009-12-03 Ladislav Hagara <hgr@vabo.cz>
+ * latest.defaults: 2.6.32
+ * info/kernels/2.6.32: added
+ * info/patches/PRE_2_6/patch-2.6.32: added
+ * info/patches/maintenance_patches/patch-2.6.32: added
+
2009-11-15 Eric Sandall <sandalle@sourcemage.org>
* UPDATE_BOOTLOADER: Check for the binary along with the config file
diff --git a/kernels/linux/info/kernels/2.6.32 b/kernels/linux/info/kernels/2.6.32
new file mode 100755
index 0000000000..d6b0ab5d25
--- /dev/null
+++ b/kernels/linux/info/kernels/2.6.32
@@ -0,0 +1,3 @@
+version="2.6.32"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
diff --git a/kernels/linux/info/patches/PRE_2_6/patch-2.6.32 b/kernels/linux/info/patches/PRE_2_6/patch-2.6.32
new file mode 100755
index 0000000000..43a4d1027c
--- /dev/null
+++ b/kernels/linux/info/patches/PRE_2_6/patch-2.6.32
@@ -0,0 +1,5 @@
+patchversion="2.6.32"
+source=""
+source_url=""
+appliedkernels="2.6.32"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.32 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32
new file mode 100755
index 0000000000..43a4d1027c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32
@@ -0,0 +1,5 @@
+patchversion="2.6.32"
+source=""
+source_url=""
+appliedkernels="2.6.32"
+md5sum=""
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 530c60fd39..c81dd41f33 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
-LATEST_2_6=2.6.31
-LATEST_PRE_2_6=patch-2.6.32-rc6
-LATEST_maintenance_patches=patch-2.6.31.6
+LATEST_2_6=2.6.32
+LATEST_PRE_2_6=patch-2.6.32
+LATEST_maintenance_patches=patch-2.6.32
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.32
LATEST_PRE_2_4=patch-2.4.33-pre1