Version bump

(Portage version: 2.2_rc1/cvs/Linux 2.6.26 i686)

3 files changed, 240 insertions, 1 deletions

diff --git a/sys-kernel/git-sources/ChangeLog b/sys-kernel/git-sources/ChangeLog
index 7cb08a96fb7f..f1df8f03f239 100644
--- a/sys-kernel/git-sources/ChangeLog
+++ b/sys-kernel/git-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/git-sources
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/ChangeLog,v 1.303 2008/07/16 01:06:29 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/ChangeLog,v 1.304 2008/07/18 01:49:18 mpagano Exp $
+
+*git-sources-2.6.26-r6 (18 Jul 2008)
+
+  18 Jul 2008; Mike Pagano <mpagano@gentoo.org>
+  +files/git-sources-2.6.26-r6-arch_ppc_makefile.patch,
+  +git-sources-2.6.26-r6.ebuild:
+  Version bump
 
 *git-sources-2.6.26-r2 (16 Jul 2008)
 
diff --git a/sys-kernel/git-sources/files/git-sources-2.6.26-r6-arch_ppc_makefile.patch b/sys-kernel/git-sources/files/git-sources-2.6.26-r6-arch_ppc_makefile.patch
new file mode 100644
index 000000000000..9ddc45b8281b
--- /dev/null
+++ b/sys-kernel/git-sources/files/git-sources-2.6.26-r6-arch_ppc_makefile.patch
@@ -0,0 +1,194 @@
+--- patch-2.6.26-git6.orig	2008-07-17 20:21:09.000000000 -0400
++++ patch-2.6.26-git6	2008-07-17 20:21:45.000000000 -0400
+@@ -152231,49 +152231,6 @@ index f94b877..0000000
+ -	default y
+ -
+ -endmenu
+-diff --git a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile
+-deleted file mode 100644
+-index 500497e..0000000
+---- a/arch/ppc/boot/Makefile
+-+++ /dev/null
+-@@ -1,37 +0,0 @@
+--#
+--# arch/ppc/boot/Makefile
+--#
+--# This file is included by the global makefile so that you can add your own
+--# architecture-specific flags and dependencies.
+--#
+--# This file is subject to the terms and conditions of the GNU General Public
+--# License.  See the file "COPYING" in the main directory of this archive
+--# for more details.
+--#
+--# Copyright (C) 1994 by Linus Torvalds
+--# Adapted for PowerPC by Gary Thomas
+--# modified by Cort (cort@cs.nmt.edu)
+--#
+--
+--# KBUILD_CFLAGS used when building rest of boot (takes effect recursively)
+--KBUILD_CFLAGS 	+= -fno-builtin -D__BOOTER__ -Iarch/$(ARCH)/boot/include
+--HOSTCFLAGS	+= -Iarch/$(ARCH)/boot/include
+--
+--BOOT_TARGETS	= zImage zImage.initrd znetboot znetboot.initrd
+--
+--bootdir-y			:= simple
+--subdir-y			:= lib common images
+--subdir-$(CONFIG_PPC_PREP)	+= of1275
+--
+--# for cleaning
+--subdir-				+= simple
+--
+--hostprogs-y := $(addprefix utils/, mkprep mkbugboot mktree)
+--
+--PHONY += $(BOOT_TARGETS) $(bootdir-y)
+--
+--$(BOOT_TARGETS): $(bootdir-y)
+--
+--$(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \
+--		$(addprefix $(obj)/,$(hostprogs-y))
+--	$(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS)
+ diff --git a/arch/ppc/boot/common/Makefile b/arch/ppc/boot/common/Makefile
+ deleted file mode 100644
+ index a2e85e3..0000000
+@@ -852743,3 +852700,141 @@ index 2d29e26..d4eae6a 100644
+  	kvm_arch_hardware_unsetup();
+  	kvm_arch_exit();
+  	kvm_exit_debug();
++--- linux-2.6.26-git6/arch/ppc/Makefile	2008-07-17 20:14:37.000000000 -0400
+++++ /dev/null	2008-07-17 01:31:14.812005950 -0400
++@@ -1,135 +0,0 @@
++-# This file is included by the global makefile so that you can add your own
++-# architecture-specific flags and dependencies.
++-#
++-# This file is subject to the terms and conditions of the GNU General Public
++-# License.  See the file "COPYING" in the main directory of this archive
++-# for more details.
++-#
++-# Copyright (C) 1994 by Linus Torvalds
++-# Changes for PPC by Gary Thomas
++-# Rewritten by Cort Dougan and Paul Mackerras
++-#
++-
++-# This must match PAGE_OFFSET in include/asm-ppc/page.h.
++-KERNELLOAD	:= $(CONFIG_KERNEL_START)
++-
++-HAS_BIARCH	:= $(call cc-option-yn, -m32)
++-ifeq ($(HAS_BIARCH),y)
++-AS		:= $(AS) -a32
++-LD		:= $(LD) -m elf32ppc
++-CC		:= $(CC) -m32
++-endif
++-
++-LDFLAGS_vmlinux	:= -Ttext $(KERNELLOAD) -Bstatic
++-# The -Iarch/$(ARCH)/include is temporary while we are merging
++-KBUILD_CPPFLAGS	+= -Iarch/$(ARCH) -Iarch/$(ARCH)/include
++-KBUILD_AFLAGS	+= -Iarch/$(ARCH)
++-KBUILD_CFLAGS	+= -Iarch/$(ARCH) -msoft-float -pipe \
++-		-ffixed-r2 -mmultiple
++-
++-# No AltiVec instruction when building kernel
++-KBUILD_CFLAGS	+= $(call cc-option, -mno-altivec)
++-
++-CPP		= $(CC) -E $(KBUILD_CFLAGS)
++-# Temporary hack until we have migrated to asm-powerpc
++-LINUXINCLUDE    += -Iarch/$(ARCH)/include
++-
++-CHECKFLAGS	+= -D__powerpc__
++-
++-cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
++-cpu-as-$(CONFIG_6xx)		+= -Wa,-maltivec
++-
++-KBUILD_AFLAGS += $(cpu-as-y)
++-KBUILD_CFLAGS += $(cpu-as-y)
++-
++-# Default to the common case.
++-KBUILD_DEFCONFIG := ebony_defconfig
++-
++-head-y				:= arch/ppc/kernel/head.o
++-head-$(CONFIG_8xx)		:= arch/ppc/kernel/head_8xx.o
++-head-$(CONFIG_4xx)		:= arch/ppc/kernel/head_4xx.o
++-head-$(CONFIG_44x)		:= arch/ppc/kernel/head_44x.o
++-
++-head-$(CONFIG_PPC_FPU)		+= arch/powerpc/kernel/fpu.o
++-
++-core-y				+= arch/ppc/kernel/ arch/powerpc/kernel/ \
++-				   arch/ppc/platforms/ \
++-				   arch/ppc/mm/ arch/ppc/lib/ \
++-				   arch/ppc/syslib/ arch/powerpc/sysdev/ \
++-				   arch/powerpc/lib/
++-core-$(CONFIG_4xx)		+= arch/ppc/platforms/4xx/
++-core-$(CONFIG_MATH_EMULATION)	+= arch/powerpc/math-emu/
++-core-$(CONFIG_XMON)		+= arch/ppc/xmon/
++-drivers-$(CONFIG_8xx)		+= arch/ppc/8xx_io/
++-drivers-$(CONFIG_4xx)		+= arch/ppc/4xx_io/
++-drivers-$(CONFIG_CPM2)		+= arch/ppc/8260_io/
++-
++-drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
++-
++-BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm
++-
++-PHONY += $(BOOT_TARGETS)
++-
++-all: uImage zImage
++-
++-CPPFLAGS_vmlinux.lds	:= -Upowerpc
++-
++-# All the instructions talk about "make bzImage".
++-bzImage: zImage
++-
++-boot := arch/$(ARCH)/boot
++-
++-$(BOOT_TARGETS): vmlinux
++-	$(Q)$(MAKE) $(build)=$(boot) $@
++-
++-uImage: vmlinux
++-	$(Q)$(MAKE) $(build)=$(boot)/images $(boot)/images/$@
++-
++-define archhelp
++-  @echo '* zImage          - Compressed kernel image (arch/$(ARCH)/boot/images/zImage.*)'
++-  @echo '  uImage          - Create a bootable image for U-Boot / PPCBoot'
++-  @echo '  install         - Install kernel using'
++-  @echo '                    (your) ~/bin/installkernel or'
++-  @echo '                    (distribution) /sbin/installkernel or'
++-  @echo '                    install to $$(INSTALL_PATH) and run lilo'
++-  @echo '  *_defconfig     - Select default config from arch/$(ARCH)/ppc/configs'
++-endef
++-
++-archclean:
++-	$(Q)$(MAKE) $(clean)=arch/ppc/boot
++-	# Temporary hack until we have migrated to asm-powerpc
++-	$(Q)rm -rf arch/$(ARCH)/include
++-
++-archprepare: checkbin
++-
++-# Temporary hack until we have migrated to asm-powerpc
++-include/asm: arch/$(ARCH)/include/asm
++-arch/$(ARCH)/include/asm:
++-	$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
++-	$(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm
++-
++-# Use the file '.tmp_gas_check' for binutils tests, as gas won't output
++-# to stdout and these checks are run even on install targets.
++-TOUT	:= $(T).tmp_gas_check
++-# Ensure this is binutils 2.12.1 (or 2.12.90.0.7) or later for altivec
++-# instructions.
++-# gcc-3.4 and binutils-2.14 are a fatal combination.
++-
++-checkbin:
++-	@if test "$(call cc-version)" = "0304" ; then \
++-		if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \
++-			echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \
++-			echo 'correctly with gcc-3.4 and your version of binutils.'; \
++-			echo '*** Please upgrade your binutils or downgrade your gcc'; \
++-			false; \
++-		fi ; \
++-	fi
++-	@if ! /bin/echo dssall | $(AS) -many -o $(TOUT) >/dev/null 2>&1 ; then \
++-		echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build ' ; \
++-		echo 'correctly with old versions of binutils.' ; \
++-		echo '*** Please upgrade your binutils to 2.12.1 or newer' ; \
++-		false ; \
++-	fi
++-
++-CLEAN_FILES += $(TOUT)
++-
diff --git a/sys-kernel/git-sources/git-sources-2.6.26-r6.ebuild b/sys-kernel/git-sources/git-sources-2.6.26-r6.ebuild
new file mode 100644
index 000000000000..f91ad4ed678c
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-2.6.26-r6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-2.6.26-r6.ebuild,v 1.1 2008/07/18 01:49:18 mpagano Exp $
+
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="http://www.kernel.org"
+#SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/v2.6/snapshots/patch-${KV_FULL}.bz2"
+SRC_URI="${KERNEL_URI}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at http://bugme.osdl.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+src_unpack () {
+	unpack $A
+	epatch "${FILESDIR}"/${P}-${PR}-arch_ppc_makefile.patch
+	kernel-2_src_unpack
+}
+
+pkg_postinst() {
+	postinst_sources
+}