[kernel] r5826 - in people/waldi/linux-2.6: . debian debian/bin
debian/patches debian/patches/series
Bastian Blank
waldi at costa.debian.org
Sat Feb 11 22:18:39 UTC 2006
Author: waldi
Date: Sat Feb 11 22:18:38 2006
New Revision: 5826
Added:
people/waldi/linux-2.6/debian/patches/git-extract-s390.patch
Removed:
people/waldi/linux-2.6/debian/bin/install-image
Modified:
people/waldi/linux-2.6/ (props changed)
people/waldi/linux-2.6/debian/bin/gencontrol.py
people/waldi/linux-2.6/debian/patches/series/0experimental.1
people/waldi/linux-2.6/debian/rules.real
Log:
Merge /dists/trunk/linux-2.6.
Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py Sat Feb 11 22:18:38 2006
@@ -80,6 +80,7 @@
makeflags['TYPE'] = 'kernel-package'
for i in (
('compiler', 'COMPILER'),
+ ('kernel-arch', 'KERNEL_ARCH'),
('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
('kpkg-arch', 'KPKG_ARCH'),
('kpkg-subarch', 'KPKG_SUBARCH'),
Added: people/waldi/linux-2.6/debian/patches/git-extract-s390.patch
==============================================================================
--- (empty file)
+++ people/waldi/linux-2.6/debian/patches/git-extract-s390.patch Sat Feb 11 22:18:38 2006
@@ -0,0 +1,79 @@
+[PATCH] s390: compile fix: missing defines in asm-s390/io.h
+
+Compile fix: add missing __raw_read* and __raw_write* defines to
+include/asm-s390/io.h.
+These are mandatory since patch c27a0d75b33c030965cc97d3d7f571107a673fb4
+was merged.
+
+Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
+Signed-off-by: Andrew Morton <akpm at osdl.org>
+Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+
+---
+commit 6ff290a0c0dec40eb6f80efbb0ac88f518bbb2a7
+tree 2104a0923095681204896057429afabd3e700314
+parent 6d7bfd14e593455a0801c62db86f82912c52c3a1
+author Heiko Carstens <heiko.carstens at de.ibm.com> Fri, 03 Feb 2006 03:03:51 -0800
+committer Linus Torvalds <torvalds at g5.osdl.org> Fri, 03 Feb 2006 08:32:01 -0800
+
+ include/asm-s390/io.h | 6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/include/asm-s390/io.h b/include/asm-s390/io.h
+index 71f55eb..b05825d 100644
+--- a/include/asm-s390/io.h
++++ b/include/asm-s390/io.h
+@@ -90,10 +90,16 @@ extern void iounmap(void *addr);
+ #define readb_relaxed(addr) readb(addr)
+ #define readw_relaxed(addr) readw(addr)
+ #define readl_relaxed(addr) readl(addr)
++#define __raw_readb readb
++#define __raw_readw readw
++#define __raw_readl readl
+
+ #define writeb(b,addr) (*(volatile unsigned char *) __io_virt(addr) = (b))
+ #define writew(b,addr) (*(volatile unsigned short *) __io_virt(addr) = (b))
+ #define writel(b,addr) (*(volatile unsigned int *) __io_virt(addr) = (b))
++#define __raw_writeb writeb
++#define __raw_writew writew
++#define __raw_writel writel
+
+ #define memset_io(a,b,c) memset(__io_virt(a),(b),(c))
+ #define memcpy_fromio(a,b,c) memcpy((a),__io_virt(b),(c))
+
+
+---
+
+
+[PATCH] Fix s390 build failure.
+
+arch/s390/kernel/compat_signal.c:199: error: conflicting types for 'do_sigaction'
+include/linux/sched.h:1115: error: previous declaration of 'do_sigaction' was here
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+
+---
+commit 21b4da78c941f292f6daf87abb562d6285216e51
+tree 705d38a01494000d3f7a1071f90870100730708a
+parent 418aade459f03318defd18ef0b11981a63bd81b0
+author Dave Jones <davej at redhat.com> Fri, 10 Feb 2006 16:27:11 -0500
+committer Linus Torvalds <torvalds at g5.osdl.org> Fri, 10 Feb 2006 13:43:59 -0800
+
+ arch/s390/kernel/compat_signal.c | 3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
+index ef70669..5291b5f 100644
+--- a/arch/s390/kernel/compat_signal.c
++++ b/arch/s390/kernel/compat_signal.c
+@@ -195,9 +195,6 @@ sys32_sigaction(int sig, const struct ol
+ return ret;
+ }
+
+-int
+-do_sigaction(int sig, const struct k_sigaction *act, struct k_sigaction *oact);
+-
+ asmlinkage long
+ sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
+ struct sigaction32 __user *oact, size_t sigsetsize)
Modified: people/waldi/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- people/waldi/linux-2.6/debian/patches/series/0experimental.1 (original)
+++ people/waldi/linux-2.6/debian/patches/series/0experimental.1 Sat Feb 11 22:18:38 2006
@@ -17,3 +17,4 @@
#FIXME + powerpc-apus.patch
+ sparc64-hme-lockup.patch
+ sparc64-atyfb-xl-gr.patch
++ git-extract-s390.patch
Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real (original)
+++ people/waldi/linux-2.6/debian/rules.real Sat Feb 11 22:18:38 2006
@@ -5,12 +5,13 @@
# Additionally, variables version, abiname and ltver are
# expected to be available (need to be exported from the parent process).
#
-SHELL := sh -e
+SHELL := bash -e
DEB_HOST_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_GNU_TYPE)
DEB_BUILD_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
export PYTHONPATH = $(CURDIR)/debian/lib/python
+export DH_OPTIONS
#
# Build the list of common config files to be included
@@ -56,7 +57,7 @@
# Targets
#
binary-arch-subarch: install-header-$(ARCH)-$(SUBARCH)
-binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR) install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
binary-indep: install-doc install-patch install-source install-tree
@@ -181,10 +182,9 @@
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/$@
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR) debian/bin/install-image
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
- install debian/bin/install-image '$(DIR)/debian/post-install'
cd '$(DIR)'; $(setup_env) $(kpkg_image) kernel-image
cat '$(DIR)/debian/files' >> debian/files
ifdef IMAGE_POSTPROC
@@ -197,7 +197,7 @@
rm -rf '$(DIR)'
install-header-$(ARCH)-$(SUBARCH): PACKAGE_NAME = linux-headers-$(VERSION)-$(ABINAME)$(LOCALVERSION_HEADERS)
-install-header-$(ARCH)-$(SUBARCH): export DH_OPTIONS = -p$(PACKAGE_NAME)
+install-header-$(ARCH)-$(SUBARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
install-header-$(ARCH)-$(SUBARCH): SOURCE_DIR = $(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
install-header-$(ARCH)-$(SUBARCH): DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
@@ -212,8 +212,9 @@
-path './arch/*' -prune -o \
-path './include/asm*' -prune -o \
-path './scripts/*' -prune -o \
- -path './include/' -o \
+ -path './include/*' -print -o \
\( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Rules.make' \) -print; \
+ find include/asm-generic -print; \
for i in $(KERNEL_HEADER_DIRS); do \
find arch/$$i \
\( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Rules.make' \) -print; \
@@ -224,6 +225,79 @@
cpio -pd --preserve-modification-time $(DIR)
$(MAKE) -f debian/rules.real install-base
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME = linux-headers-$(VERSION)-$(ABINAME)$(LOCALVERSION)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_NAME_HEADERS = linux-headers-$(VERSION)-$(ABINAME)$(LOCALVERSION_HEADERS)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): BASE_DIR = /usr/src/$(PACKAGE_NAME)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR = $(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): REF_DIR = $(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DIR)
+install-header-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
+ dh_testdir
+ dh_testroot
+ dh_clean -k -d
+
+ mkdir -p "${DIR}/arch/${KERNEL_ARCH}/kernel"
+ mkdir -p "${DIR}/include"
+ cp -a ${SOURCE_DIR}/{.config,Module.symvers} "${DIR}"
+ echo ${DEBIAN_LOCALVERSION} > "${DIR}/localversion"
+
+ cd ${SOURCE_DIR}; \
+ find . -mindepth 1 -maxdepth 1 \
+ ! -name debian -a ! -name Documentation -a ! -name include -a \
+ ! -name DEBIAN -a ! -name scripts -a ! -name arch -a ! -name '.*' -a \( \
+ -name Makefile -o -type d \) \
+ -printf "../${PACKAGE_NAME_HEADERS}/%f\n" | \
+ xargs ln -s --target-directory="${DIR}"
+
+ cd ${SOURCE_DIR}; \
+ find "arch/${KERNEL_ARCH}" -mindepth 1 -maxdepth 1 \( \
+ -type d -a ! -name include -a ! -name kernel -o \
+ -type f -a \( -name 'Makefile*' -o -name 'Kconfig*' \) \) \
+ -printf "../../../${PACKAGE_NAME_HEADERS}/%p\n" | \
+ xargs ln -s --target-directory="${DIR}/arch/${KERNEL_ARCH}"
+
+ [ -d "${SOURCE_DIR}/arch/${KERNEL_ARCH}/include" ] && \
+ cp -a "${SOURCE_DIR}/arch/${KERNEL_ARCH}/include" "${DIR}/arch/${KERNEL_ARCH}/include" || :
+ [ -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/kernel/asm-offsets.s" ] && \
+ ln -f "${SOURCE_DIR}/arch/${KERNEL_ARCH}/kernel/asm-offsets.s" "${DIR}/arch/${KERNEL_ARCH}/kernel" || :
+ ln -s "../../../../${PACKAGE_NAME_HEADERS}/arch/${KERNEL_ARCH}/kernel/Makefile" "${DIR}/arch/${KERNEL_ARCH}/kernel"
+
+ cd ${SOURCE_DIR}; \
+ find include -mindepth 1 -maxdepth 1 \
+ ! -name config -a ! -name linux -a ! -name 'asm-*' \
+ -printf "../../${PACKAGE_NAME_HEADERS}/%p\n" | \
+ xargs ln -s --target-directory="${DIR}/include"
+ cp -a ${SOURCE_DIR}/include/config "${DIR}/include"
+
+ ln -sf "asm-${KERNEL_ARCH}" "${DIR}/include/asm"
+
+ cd ${SOURCE_DIR}; \
+ for dir in linux asm-generic $(foreach t, $(KERNEL_HEADER_DIRS), asm-$(t)); do \
+ mkdir "${DIR}/include/$$dir"; \
+ for file in $$(find "include/$$dir" -mindepth 1 -maxdepth 1); do \
+ if [ -e ${CURDIR}/${REF_DIR}/$$file ]; then \
+ ln -s --target-directory="${DIR}/include/$$dir" "../../../${PACKAGE_NAME_HEADERS}/${REF_DIR}/$$file"; \
+ elif [ -d ${CURDIR}/${SOURCE_DIR}/$$file ]; then \
+ cp -a "${CURDIR}/${SOURCE_DIR}/$$file" "${DIR}/include/$$dir"; \
+ else \
+ ln -f --target-directory="${DIR}/include/$$dir" "${CURDIR}/${SOURCE_DIR}/$$file"; \
+ fi \
+ done \
+ done
+
+ mkdir -p "${PACKAGE_DIR}/lib/modules/${UPSTREAM_VERSION}"
+ ln -s "/usr/src/${PACKAGE_NAME}" "${PACKAGE_DIR}/lib/modules/${UPSTREAM_VERSION}/build"
+
+ # Populate the scripts directory. The strategy here is to specify what
+ # *not* to copy, to make things a little bit more robust. We first create
+ # a file with exclude patterns, then copy everything minus excluded files.
+ #
+ tar $(foreach t, *.c *.h *.y *.l *.gperf *POTFILES.in .gitignore *lxdialog* *package* *.cc *.glade *_shipped, --exclude=$(t)) -chf - scripts | (cd "${DIR}"; umask 000; tar xsf -)
+
+ $(MAKE) -f debian/rules.real install-base
+
install-headers-all: DH_OPTIONS = -plinux-headers-$(VERSION)
install-headers-all:
dh_testdir
More information about the Kernel-svn-changes
mailing list