rpms/kernel/devel kernel-2.6.spec, 1.2429, 1.2430 linux-2.6-utrace.patch, 1.6, 1.7
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jul 21 01:20:26 UTC 2006
- Previous message (by thread): rpms/jrefactory/devel jrefactory-2.8.9-fixcrlf.patch, NONE, 1.1 jrefactory.spec, 1.9, 1.10 jrefactory-htmleditorkit.patch, 1.1, NONE jrefactory-pr21880.patch, 1.1, NONE
- Next message (by thread): rpms/vixie-cron/devel vixie-cron-4.1-_53_bz199294_selinux_mls.patch, NONE, 1.1 vixie-cron-4.1-_54_bz198019_database_changes.patch, NONE, 1.1 vixie-cron.spec, 1.71, 1.72
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: roland
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5408
Modified Files:
kernel-2.6.spec linux-2.6-utrace.patch
Log Message:
* Thu Jul 20 2006 Roland McGrath <roland at redhat.com>
- Clean up spec changes for debuginfo generation to cover Xen case.
- New version of utrace patch, fixes /proc permissions. (#199014)
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2429
retrieving revision 1.2430
diff -u -r1.2429 -r1.2430
--- kernel-2.6.spec 20 Jul 2006 18:05:47 -0000 1.2429
+++ kernel-2.6.spec 21 Jul 2006 01:20:21 -0000 1.2430
@@ -1086,7 +1086,7 @@
# Create the kABI metadata for use in packaging
echo "**** GENERATING kernel ABI metadata ****"
- gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz
+ gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz
chmod 0755 %_sourcedir/kabitool
if [ ! -e $RPM_SOURCE_DIR/kabi_whitelist ]; then
%_sourcedir/kabitool -b $RPM_BUILD_ROOT/boot -k $KernelVer -l -w $RPM_BUILD_ROOT/kabi_whitelist
@@ -1294,6 +1294,7 @@
# may be empty
# Second argument, optional: subpackage name (e.g. smp)
# Third argument, optional: suffix in %1 dir, if not -%2 (e.g. -PAE)
+# Fourth argument, optional: glob of extra ELF files (e.g. boot/xen*-V-R)
%define build_debuginfo() \
%if "%{_enable_debug_packages}" == "1"\
%ifnarch noarch\
@@ -1312,8 +1313,8 @@
%endif\
/usr/lib/debug/lib/modules/%{KVERREL}%{?2}\
/usr/lib/debug/usr/src/kernels/%{KVERREL}%{?2:-%{2}}-%{_target_cpu}\
-%if "%{?2}" == "xen" \
-/usr/lib/debug/boot/xen-syms-%{KVERREL}.debug\
+%if "%{?4}" != ""\
+/usr/lib/debug/%{?4}.debug\
%endif\
%endif\
%endif\
@@ -1465,8 +1466,12 @@
### file lists
###
+# This is %{image_install_path} on an arch where that includes ELF files,
+# or empty otherwise.
+%define elf_image_install_path %{?kernel_image_elf:%{image_install_path}}
+
%if %{buildup}
-%build_debuginfo %{?kernel_image_elf:%{image_install_path}}
+%build_debuginfo %{elf_image_install_path}
%files
%defattr(-,root,root)
/%{image_install_path}/vmlinuz-%{KVERREL}
@@ -1494,7 +1499,7 @@
%endif
%if %{buildpae}
-%build_debuginfo %{?kernel_image_elf:%{image_install_path}} PAE
+%build_debuginfo %{elf_image_install_path} PAE
%files PAE
%defattr(-,root,root)
/%{image_install_path}/vmlinuz-%{KVERREL}PAE
@@ -1517,7 +1522,7 @@
%endif
%if %{buildsmp}
-%build_debuginfo %{?kernel_image_elf:%{image_install_path}} smp
+%build_debuginfo %{elf_image_install_path} smp
%files smp
%defattr(-,root,root)
/%{image_install_path}/vmlinuz-%{KVERREL}smp
@@ -1541,7 +1546,7 @@
%if %{includexen}
%if %{buildxen}
-%build_debuginfo %{?kernel_image_elf:%{image_install_path}} xen
+%build_debuginfo %{elf_image_install_path} xen xen boot/xen*-%{KVERREL}
%files xen
%defattr(-,root,root)
/%{image_install_path}/vmlinuz-%{KVERREL}xen
@@ -1569,6 +1574,7 @@
%endif
%if %{buildkdump}
+# The kdump kernel is always installed as an ELF file in %{image_install_path}.
%build_debuginfo %{image_install_path} kdump
%files kdump
%defattr(-,root,root)
@@ -1602,6 +1608,10 @@
%endif
%changelog
+* Thu Jul 20 2006 Roland McGrath <roland at redhat.com>
+- Clean up spec changes for debuginfo generation to cover Xen case.
+- New version of utrace patch, fixes /proc permissions. (#199014)
+
* Thu Jul 20 2006 Juan Quintela <quintela at anano.mitica>
- remove xenPAE option, as now the i686 xen kernel is PAE.
@@ -1617,11 +1627,11 @@
* Wed Jul 19 2006 Don Zickus <dzickus at redhat.com>
- Add in support for nfs superblock sharing and cachefs
patches from David Howells
-- Disable 'make prepare' hack as it is breaking ppc symlinks
+- Disable 'make prepare' hack as it is breaking ppc symlinks
- Added tracking dirty pages patch from Peter Zijlstra
- Fix for Opteron timer scaling
- Fix for Calgary pci hang
-
+
* Wed Jul 19 2006 Juan Quintela <quintela at redhat>
- big xen patch.
- enable xen again.
linux-2.6-utrace.patch:
Documentation/utrace.txt | 451 +++++++++
arch/alpha/kernel/asm-offsets.c | 2
arch/alpha/kernel/entry.S | 4
arch/arm/kernel/ptrace.c | 36
arch/arm26/kernel/ptrace.c | 32
arch/frv/kernel/ptrace.c | 15
arch/i386/kernel/entry.S | 7
arch/i386/kernel/i387.c | 143 +--
arch/i386/kernel/process.c | 3
arch/i386/kernel/ptrace.c | 862 ++++++++++--------
arch/i386/kernel/signal.c | 39
arch/i386/kernel/vm86.c | 7
arch/ia64/ia32/sys_ia32.c | 2
arch/ia64/kernel/asm-offsets.c | 2
arch/ia64/kernel/fsys.S | 16
arch/ia64/kernel/mca.c | 2
arch/ia64/kernel/ptrace.c | 41
arch/mips/kernel/ptrace.c | 21
arch/mips/kernel/sysirix.c | 2
arch/powerpc/kernel/Makefile | 4
arch/powerpc/kernel/asm-offsets.c | 2
arch/powerpc/kernel/process.c | 5
arch/powerpc/kernel/ptrace-common.h | 161 ---
arch/powerpc/kernel/ptrace.c | 842 +++++++++---------
arch/powerpc/kernel/ptrace32.c | 436 ---------
arch/powerpc/kernel/signal_32.c | 56 +
arch/powerpc/kernel/signal_64.c | 4
arch/powerpc/kernel/sys_ppc32.c | 5
arch/powerpc/lib/sstep.c | 3
arch/powerpc/platforms/cell/spufs/run.c | 2
arch/ppc/kernel/asm-offsets.c | 2
arch/s390/kernel/compat_linux.c | 3
arch/s390/kernel/process.c | 3
arch/s390/kernel/ptrace.c | 79 -
arch/s390/kernel/traps.c | 6
arch/sparc64/kernel/ptrace.c | 18
arch/x86_64/ia32/fpu32.c | 92 +
arch/x86_64/ia32/ia32_aout.c | 6
arch/x86_64/ia32/ia32_signal.c | 8
arch/x86_64/ia32/ia32entry.S | 2
arch/x86_64/ia32/ptrace32.c | 709 ++++++++++-----
arch/x86_64/ia32/sys_ia32.c | 5
arch/x86_64/kernel/process.c | 5
arch/x86_64/kernel/ptrace.c | 632 ++++++++-----
arch/x86_64/kernel/signal.c | 30
arch/x86_64/kernel/traps.c | 8
arch/x86_64/mm/fault.c | 4
drivers/connector/cn_proc.c | 4
fs/binfmt_aout.c | 6
fs/binfmt_elf.c | 6
fs/binfmt_elf_fdpic.c | 7
fs/binfmt_flat.c | 3
fs/binfmt_som.c | 2
fs/exec.c | 11
fs/proc/array.c | 7
fs/proc/base.c | 17
include/asm-i386/i387.h | 13
include/asm-i386/signal.h | 4
include/asm-i386/thread_info.h | 7
include/asm-i386/tracehook.h | 73 +
include/asm-powerpc/tracehook.h | 302 ++++++
include/asm-x86_64/fpu32.h | 3
include/asm-x86_64/thread_info.h | 2
include/asm-x86_64/tracehook.h | 105 ++
include/linux/init_task.h | 3
include/linux/ptrace.h | 82 -
include/linux/sched.h | 25
include/linux/tracehook.h | 568 ++++++++++++
include/linux/utrace.h | 459 +++++++++
init/Kconfig | 29
kernel/Makefile | 1
kernel/exit.c | 251 +----
kernel/fork.c | 60 -
kernel/ptrace.c | 1470 ++++++++++++++++++++++++-------
kernel/signal.c | 211 ----
kernel/sys.c | 2
kernel/timer.c | 6
kernel/utrace.c | 1477 ++++++++++++++++++++++++++++++++
security/selinux/hooks.c | 6
79 files changed, 6853 insertions(+), 3188 deletions(-)
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-utrace.patch 19 Jul 2006 12:45:49 -0000 1.6
+++ linux-2.6-utrace.patch 21 Jul 2006 01:20:23 -0000 1.7
@@ -53,7 +53,7 @@
fs/binfmt_som.c | 2
fs/exec.c | 11
fs/proc/array.c | 7
- fs/proc/base.c | 18
+ fs/proc/base.c | 17
include/asm-i386/i387.h | 13
include/asm-i386/signal.h | 4
include/asm-i386/thread_info.h | 7
@@ -77,7 +77,7 @@
kernel/timer.c | 6
kernel/utrace.c | 1477 +++++++++++++++++++++++++++++++
security/selinux/hooks.c | 6
- 79 files changed, 6847 insertions(+), 3185 deletions(-)
+ 79 files changed, 6848 insertions(+), 3183 deletions(-)
create mode 100644 Documentation/utrace.txt
delete arch/powerpc/kernel/ptrace-common.h
delete arch/powerpc/kernel/ptrace32.c
@@ -6507,48 +6507,33 @@
static int proc_pid_environ(struct task_struct *task, char * buffer)
{
int res = 0;
-@@ -421,7 +415,7 @@ static int proc_pid_environ(struct task_
- if (len > PAGE_SIZE)
- len = PAGE_SIZE;
- res = access_process_vm(task, mm->env_start, buffer, len, 0);
-- if (!ptrace_may_attach(task))
-+ if (!tracehook_allow_access_process_vm(task))
- res = -ESRCH;
- mmput(mm);
- }
-@@ -545,7 +539,7 @@ static int proc_fd_access_allowed(struct
- */
- task = get_proc_task(inode);
- if (task) {
-- allowed = ptrace_may_attach(task);
-+ allowed = tracehook_allow_access_process_vm(task);
- put_task_struct(task);
- }
- return allowed;
-@@ -736,7 +730,7 @@ static ssize_t mem_read(struct file * fi
+@@ -736,7 +730,8 @@ static ssize_t mem_read(struct file * fi
if (!task)
goto out_no_task;
- if (!MAY_PTRACE(task) || !ptrace_may_attach(task))
-+ if (!tracehook_allow_access_process_vm(task))
++ if (!tracehook_allow_access_process_vm(task)
++ || !ptrace_may_attach(task))
goto out;
ret = -ENOMEM;
-@@ -762,7 +756,7 @@ static ssize_t mem_read(struct file * fi
+@@ -762,7 +757,8 @@ static ssize_t mem_read(struct file * fi
this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
retval = access_process_vm(task, src, page, this_len, 0);
- if (!retval || !MAY_PTRACE(task) || !ptrace_may_attach(task)) {
-+ if (!retval || !tracehook_allow_access_process_vm(task)) {
++ if (!retval || !tracehook_allow_access_process_vm(task)
++ || !ptrace_may_attach(task)) {
if (!ret)
ret = -EIO;
break;
-@@ -806,7 +800,7 @@ static ssize_t mem_write(struct file * f
+@@ -806,7 +802,8 @@ static ssize_t mem_write(struct file * f
if (!task)
goto out_no_task;
- if (!MAY_PTRACE(task) || !ptrace_may_attach(task))
-+ if (!tracehook_allow_access_process_vm(task))
++ if (!tracehook_allow_access_process_vm(task)
++ || !ptrace_may_attach(task))
goto out;
copied = -ENOMEM;
- Previous message (by thread): rpms/jrefactory/devel jrefactory-2.8.9-fixcrlf.patch, NONE, 1.1 jrefactory.spec, 1.9, 1.10 jrefactory-htmleditorkit.patch, 1.1, NONE jrefactory-pr21880.patch, 1.1, NONE
- Next message (by thread): rpms/vixie-cron/devel vixie-cron-4.1-_53_bz199294_selinux_mls.patch, NONE, 1.1 vixie-cron-4.1-_54_bz198019_database_changes.patch, NONE, 1.1 vixie-cron.spec, 1.71, 1.72
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list