rpms/kernel/devel kernel.spec, 1.879, 1.880 linux-2.6-utrace.patch, 1.90, 1.91

Roland McGrath (roland) fedora-extras-commits at redhat.com
Thu Aug 14 01:23:20 UTC 2008 

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27515

Modified Files:
	kernel.spec linux-2.6-utrace.patch 
Log Message:
* Wed Aug 13 2008 Roland McGrath <roland at redhat.com>
- enable kernel-doc, include htmldocs
- utrace kerneldoc typo fixes



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.879
retrieving revision 1.880
diff -u -r1.879 -r1.880
--- kernel.spec	14 Aug 2008 00:39:43 -0000	1.879
+++ kernel.spec	14 Aug 2008 01:22:50 -0000	1.880
@@ -83,8 +83,14 @@
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
 
-# don't build the kernel-doc package
-%define with_doc 0
+# Build the kernel-doc package, but don't fail the build if it botches.
+# Here "true" means "continue" and "false" means "fail the build".
+#% define with_doc 0
+%if 0%{?released_kernel}
+%define doc_build_fail false
+%else
+%define doc_build_fail true
+%endif
 
 # Additional options for user-friendly one-off kernel building:
 #
@@ -1476,6 +1482,15 @@
 BuildKernel vmlinux vmlinux kdump vmlinux
 %endif
 
+%if %{with_doc}
+# Make the HTML and man pages.
+make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
+
+# sometimes non-world-readable files sneak into the kernel source tree
+chmod -R a=rX Documentation
+find Documentation -type d | xargs chmod u+w
+%endif
+
 ###
 ### Special hacks for debuginfo subpackages.
 ###
@@ -1506,17 +1521,21 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 %if %{with_doc}
-mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kernel-doc-%{kversion}/Documentation
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}
+man9dir=$RPM_BUILD_ROOT%{_datadir}/man/man9
 
-# sometimes non-world-readable files sneak into the kernel source tree
-chmod -R a+r *
 # copy the source over
-tar cf - Documentation | tar xf - -C $RPM_BUILD_ROOT/usr/share/doc/kernel-doc-%{kversion}
+mkdir -p $docdir
+tar -f - --exclude=man --exclude='.*' -c Documentation | tar xf - -C $docdir
 
-# Make man pages for the kernel API.
-make mandocs
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/man9
-mv Documentation/DocBook/man/*.9.gz $RPM_BUILD_ROOT/usr/share/man/man9
+# Install man pages for the kernel API.
+mkdir -p $man9dir
+m=`ls Documentation/DocBook/man/*.9.gz 2> /dev/null`
+if [ -z "$m" ]; then
+  > $man9dir/BROKEN
+else
+  %{__install} -m 444 -t $man9dir Documentation/DocBook/man/*.9.gz
+fi
 %endif
 
 %if %{with_headers}
@@ -1676,9 +1695,9 @@
 %if %{with_doc}
 %files doc
 %defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{kversion}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{kversion}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{kversion}
+%{_datadir}/doc/kernel-doc-%{rpmversion}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{rpmversion}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{rpmversion}
 %{_datadir}/man/man9/*
 %endif
 
@@ -1745,6 +1764,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Aug 13 2008 Roland McGrath <roland at redhat.com>
+- enable kernel-doc, include htmldocs
+- utrace kerneldoc typo fixes
+
 * Wed Aug 13 2008 Dave Jones <davej at redhat.com>
 - 2.6.27-rc3-git1
 

linux-2.6-utrace.patch:

Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- linux-2.6-utrace.patch	11 Aug 2008 18:06:04 -0000	1.90
+++ linux-2.6-utrace.patch	14 Aug 2008 01:22:50 -0000	1.91
@@ -13,7 +13,7 @@
  12 files changed, 4525 insertions(+), 7 deletions(-)
 
 diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index 1d1b345..1ca1628 100644  
+index 1615350..92ca631 100644  
 --- a/Documentation/DocBook/Makefile
 +++ b/Documentation/DocBook/Makefile
 @@ -7,7 +7,7 @@
@@ -658,7 +658,7 @@
   * ptrace_init_task - initialize ptrace state for a new child
   * @child:		new child task
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 5270d44..d13c10f 100644  
+index 5850bfb..3d06ba0 100644  
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -1195,6 +1195,11 @@ struct task_struct {
@@ -673,7 +673,7 @@
  /* Thread group tracking */
     	u32 parent_exec_id;
     	u32 self_exec_id;
-@@ -1790,6 +1795,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1767,6 +1772,7 @@ extern int kill_pgrp(struct pid *pid, in
  extern int kill_pid(struct pid *pid, int sig, int priv);
  extern int kill_proc_info(int, struct siginfo *, pid_t);
  extern int do_notify_parent(struct task_struct *, int);
@@ -900,7 +900,7 @@
  
 diff --git a/include/linux/utrace.h b/include/linux/utrace.h
 new file mode 100644
-index ...17ac621 100644  
+index ...1509012 100644  
 --- /dev/null
 +++ b/include/linux/utrace.h
 @@ -0,0 +1,711 @@
@@ -1291,7 +1291,7 @@
 + * the @action argument.  The resume action returned by a callback
 + * does not override previous engines' choices, it only says what
 + * @engine wants done.  What @task actually does is the action that's
-+ * most contrained among the choices made by all attached engines.
++ * most constrained among the choices made by all attached engines.
 + * See utrace_control() for more information on the actions.
 + *
 + * When %UTRACE_STOP is used in @report_syscall_entry, then @task
@@ -2374,10 +2374,10 @@
  }
  
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 954f77d..c7a2aca 100644  
+index c539f60..0f5ed3c 100644  
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
-@@ -1413,7 +1413,7 @@ int do_notify_parent(struct task_struct 
+@@ -1414,7 +1414,7 @@ int do_notify_parent(struct task_struct 
  	return sig;
  }
  
@@ -2386,7 +2386,7 @@
  {
  	struct siginfo info;
  	unsigned long flags;
-@@ -1468,6 +1468,8 @@ static void do_notify_parent_cldstop(str
+@@ -1469,6 +1469,8 @@ static void do_notify_parent_cldstop(str
  	spin_unlock_irqrestore(&sighand->siglock, flags);
  }
  
@@ -2395,7 +2395,7 @@
  static inline int may_ptrace_stop(void)
  {
  	if (!likely(current->ptrace & PT_PTRACED))
-@@ -1600,6 +1602,8 @@ void ptrace_notify(int exit_code)
+@@ -1601,6 +1603,8 @@ void ptrace_notify(int exit_code)
  	spin_unlock_irq(&current->sighand->siglock);
  }
  
@@ -2404,7 +2404,7 @@
  static void
  finish_stop(int stop_count)
  {
-@@ -1677,6 +1681,7 @@ static int do_signal_stop(int signr)
+@@ -1678,6 +1682,7 @@ static int do_signal_stop(int signr)
  	return 1;
  }
  
@@ -2412,7 +2412,7 @@
  static int ptrace_signal(int signr, siginfo_t *info,
  			 struct pt_regs *regs, void *cookie)
  {
-@@ -1715,6 +1720,13 @@ static int ptrace_signal(int signr, sigi
+@@ -1716,6 +1721,13 @@ static int ptrace_signal(int signr, sigi
  
  	return signr;
  }
@@ -2428,7 +2428,7 @@
  			  struct pt_regs *regs, void *cookie)
 diff --git a/kernel/utrace.c b/kernel/utrace.c
 new file mode 100644
-index ...df7229c 100644  
+index ...807384d 100644  
 --- /dev/null
 +++ b/kernel/utrace.c
 @@ -0,0 +1,2515 @@
@@ -2990,7 +2990,7 @@
 +/*
 + * The caller has to hold a ref on the engine.  If the attached flag is
 + * true (all but utrace_barrier() calls), the engine is supposed to be
-+ * attached.  If the attached is flag is false (utrace_barrier() only),
++ * attached.  If the attached flag is false (utrace_barrier() only),
 + * then return -ERESTARTSYS for an engine marked for detach but not yet
 + * fully detached.  The task pointer can be invalid if the engine is
 + * detached.
@@ -3506,7 +3506,7 @@
 + * that want it stopped.
 + *
 + * If the @report_reap callback may already have begun, this fails
-+ * with -%ESRCH.  If the @report_deeath callback may already have
++ * with -%ESRCH.  If the @report_death callback may already have
 + * begun, this fails with -%EALREADY.
 + *
 + * If @target is not already stopped, then a callback to this engine
@@ -4838,7 +4838,7 @@
 + *
 + * When this returns an error, any examination done since the paired
 + * utrace_prepare_examine() call is unreliable and the data extracted
-+ * should be discarded.  The error is -%EINVAL is @engine is not
++ * should be discarded.  The error is -%EINVAL if @engine is not
 + * keeping @target stopped, or -%EAGAIN if @target woke up unexpectedly.
 + */
 +int utrace_finish_examine(struct task_struct *target,

More information about the fedora-extras-commits mailing list