rpms/kernel/devel patch-2.6.24-rc3-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.719, 1.720 Makefile, 1.62, 1.63 config-ia64-generic, 1.5, 1.6 config-x86-generic, 1.19, 1.20 config-x86_64-generic, 1.17, 1.18 kernel.spec, 1.254, 1.255 sources, 1.678, 1.679 upstream, 1.601, 1.602 patch-2.6.24-rc3-git1.bz2.sign, 1.1, NONE
Dave Jones (davej)
fedora-extras-commits at redhat.com
Tue Nov 27 19:19:35 UTC 2007
Author: davej
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25584
Modified Files:
.cvsignore Makefile config-ia64-generic config-x86-generic
config-x86_64-generic kernel.spec sources upstream
Added Files:
patch-2.6.24-rc3-git2.bz2.sign
Removed Files:
patch-2.6.24-rc3-git1.bz2.sign
Log Message:
* Tue Nov 27 2007 Dave Jones <davej at redhat.com>
- 2.6.24-rc3-git2
--- NEW FILE patch-2.6.24-rc3-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBHS8EpyGugalF9Dw4RAjkAAKCRjCK/sxIwMSxJn6a+ucdEVJdpzACgjfVw
iowk3GlLVmk/L6WyzvUXCXQ=
=RACB
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.719
retrieving revision 1.720
diff -u -r1.719 -r1.720
--- .cvsignore 19 Nov 2007 05:17:11 -0000 1.719
+++ .cvsignore 27 Nov 2007 19:18:54 -0000 1.720
@@ -4,4 +4,4 @@
kernel-2.6.23
linux-2.6.23.tar.bz2
patch-2.6.24-rc3.bz2
-patch-2.6.24-rc3-git1.bz2
+patch-2.6.24-rc3-git2.bz2
Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Makefile 16 Nov 2007 16:35:04 -0000 1.62
+++ Makefile 27 Nov 2007 19:18:54 -0000 1.63
@@ -103,10 +103,10 @@
@rm -f $@
(echo %define nopatches 1; cat $<) > $@
-scratch-build: NAME = $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) -q --qf "%{NAME}\n" --specfile $(SPECFILE)| head -1)
-scratch-build: test-srpm
- $(BUILD_CLIENT) build $(BUILD_FLAGS) --scratch $(TARGET) \
- $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
+#scratch-build: NAME = $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) -q --qf "%{NAME}\n" --specfile $(SPECFILE)| head -1)
+#scratch-build: test-srpm
+# $(BUILD_CLIENT) build $(BUILD_FLAGS) --scratch $(TARGET) \
+# $(SRCRPMDIR)/$(NAME)-$(VERSION)-$(RELEASE).src.rpm
# Dismal kludge for building via brew from cvs after "make vanilla-tag".
ifdef BEEHIVE_SRPM_BUILD
Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-ia64-generic,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-ia64-generic 14 Nov 2007 18:36:06 -0000 1.5
+++ config-ia64-generic 27 Nov 2007 19:18:54 -0000 1.6
@@ -114,8 +114,9 @@
CONFIG_ACPI=y
CONFIG_ACPI_AC=m
# CONFIG_ACPI_ASUS is not set
-CONFIG_ACPI_BAY=m
-CONFIG_ACPI_BATTERY=m
+# CONFIG_ACPI_PROCFS_POWER is not set
+# CONFIG_ACPI_BAY is not set
+# CONFIG_ACPI_BATTERY is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_BUTTON=m
# CONFIG_ACPI_DOCK is not set
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-x86-generic 15 Nov 2007 18:02:03 -0000 1.19
+++ config-x86-generic 27 Nov 2007 19:18:54 -0000 1.20
@@ -126,6 +126,7 @@
CONFIG_ACPI=y
CONFIG_ACPI_AC=m
# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BAY=m
CONFIG_ACPI_BLACKLIST_YEAR=1999
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- config-x86_64-generic 15 Nov 2007 18:02:03 -0000 1.17
+++ config-x86_64-generic 27 Nov 2007 19:18:54 -0000 1.18
@@ -71,6 +71,7 @@
CONFIG_ACPI=y
CONFIG_ACPI_AC=m
# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BAY=m
CONFIG_ACPI_BLACKLIST_YEAR=0
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- kernel.spec 27 Nov 2007 05:38:03 -0000 1.254
+++ kernel.spec 27 Nov 2007 19:18:54 -0000 1.255
@@ -47,7 +47,7 @@
# The rc snapshot level
%define rcrev 3
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -883,7 +883,6 @@
%if %{using_upstream_branch}
### BRANCH APPLY ###
%else
-
# released_kernel with stable_update available case
%if 0%{?stable_update}
ApplyPatch patch-2.6.%{base_sublevel}.%{stable_update}.bz2
@@ -901,8 +900,8 @@
%endif
%endif
%endif
-
%endif
+
cd ..
else
@@ -1094,7 +1093,7 @@
ApplyPatch linux-2.6-ata-quirk.patch
# wireless patches headed for 2.6.24
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
# wireless patches headed for 2.6.25
ApplyPatch linux-2.6-wireless-pending.patch
@@ -1706,6 +1705,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
%changelog
+* Tue Nov 27 2007 Dave Jones <davej at redhat.com>
+- 2.6.24-rc3-git2
+
* Tue Nov 27 2007 Kyle McMartin <kmcmartin at redhat.com>
- Slurp up drm-mm/agp-mm from git.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -r1.678 -r1.679
--- sources 19 Nov 2007 05:17:11 -0000 1.678
+++ sources 27 Nov 2007 19:18:54 -0000 1.679
@@ -1,3 +1,2 @@
2cc2fd4d521dc5d7cfce0d8a9d1b3472 linux-2.6.23.tar.bz2
b9a66b38fdfa600112f0c6172440a179 patch-2.6.24-rc3.bz2
-60a87c428e9452aa2569bc258b51e493 patch-2.6.24-rc3-git1.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -r1.601 -r1.602
--- upstream 19 Nov 2007 05:17:11 -0000 1.601
+++ upstream 27 Nov 2007 19:18:54 -0000 1.602
@@ -1,3 +1,3 @@
linux-2.6.23.tar.bz2
patch-2.6.24-rc3.bz2
-patch-2.6.24-rc3-git1.bz2
+patch-2.6.24-rc3-git2.bz2
--- patch-2.6.24-rc3-git1.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list