date:20150303

[Xenomai-git] Philippe Gerum : build: make $prefix value available to configure script

2015-03-03 Thread git repository hosting

Module: xenomai-3
Branch: next
Commit: dc1f7755d5156432e146f41c2c1d17a81b56dd97
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=dc1f7755d5156432e146f41c2c1d17a81b56dd97

Author: Philippe Gerum r...@xenomai.org
Date:   Tue Mar  3 20:52:57 2015 +0100

build: make $prefix value available to configure script

---

 configure|   73 +++---
 configure.ac |   15 
 2 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/configure b/configure
index 4722de5..00c0535 100755
--- a/configure
+++ b/configure
@@ -2363,6 +2363,45 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+ac_config_headers=$ac_config_headers include/xeno_config.h
+
+ac_aux_dir=
+for ac_dir in config $srcdir/config; do
+  if test -f $ac_dir/install-sh; then
+ac_aux_dir=$ac_dir
+ac_install_sh=$ac_aux_dir/install-sh -c
+break
+  elif test -f $ac_dir/install.sh; then
+ac_aux_dir=$ac_dir
+ac_install_sh=$ac_aux_dir/install.sh -c
+break
+  elif test -f $ac_dir/shtool; then
+ac_aux_dir=$ac_dir
+ac_install_sh=$ac_aux_dir/shtool install -c
+break
+  fi
+done
+if test -z $ac_aux_dir; then
+  as_fn_error $? cannot find install-sh, install.sh, or shtool in config 
\$srcdir\/config $LINENO 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess=$SHELL $ac_aux_dir/config.guess  # Please don't use this var.
+ac_config_sub=$SHELL $ac_aux_dir/config.sub  # Please don't use this var.
+ac_configure=$SHELL $ac_aux_dir/configure  # Please don't use this var.
+
+
+
+
+
+# We want $prefix to be set for the configure script
+if test x$prefix = xNONE; then
+   prefix=$ac_default_prefix
+fi
+
 version_code=`cat $srcdir/config/version-code`
 CONFIG_XENO_VERSION_MAJOR=`expr $version_code : '\([0-9]*\)'`
 CONFIG_XENO_VERSION_MINOR=`expr $version_code : '[0-9]*\.\([0-9]*\)'`
@@ -2429,40 +2468,6 @@ if eval test $includedir = /usr/include; then
   as_fn_error $? Using /usr/include as includedir is not supported. Please 
change your --prefix or specify another --includedir $LINENO 5
 fi
 
-ac_config_headers=$ac_config_headers include/xeno_config.h
-
-ac_aux_dir=
-for ac_dir in config $srcdir/config; do
-  if test -f $ac_dir/install-sh; then
-ac_aux_dir=$ac_dir
-ac_install_sh=$ac_aux_dir/install-sh -c
-break
-  elif test -f $ac_dir/install.sh; then
-ac_aux_dir=$ac_dir
-ac_install_sh=$ac_aux_dir/install.sh -c
-break
-  elif test -f $ac_dir/shtool; then
-ac_aux_dir=$ac_dir
-ac_install_sh=$ac_aux_dir/shtool install -c
-break
-  fi
-done
-if test -z $ac_aux_dir; then
-  as_fn_error $? cannot find install-sh, install.sh, or shtool in config 
\$srcdir\/config $LINENO 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess=$SHELL $ac_aux_dir/config.guess  # Please don't use this var.
-ac_config_sub=$SHELL $ac_aux_dir/config.sub  # Please don't use this var.
-ac_configure=$SHELL $ac_aux_dir/configure  # Please don't use this var.
-
-
-
-
-
 # Make sure we can run config.sub.
 $SHELL $ac_aux_dir/config.sub sun4 /dev/null 21 ||
   as_fn_error $? cannot run $SHELL $ac_aux_dir/config.sub $LINENO 5
diff --git a/configure.ac b/configure.ac
index af2e73d..e04894f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,16 @@ AC_PREREQ(2.62)
 # defined for each architecture in the asm/features.h file.
 
AC_INIT([Xenomai],m4_normalize(m4_include([config/version-label])),xeno...@xenomai.org)
 
+AC_CONFIG_HEADERS(include/xeno_config.h)
+AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR([config])
+AC_CONFIG_SRCDIR(lib/cobalt/thread.c)
+AC_PREFIX_DEFAULT(/usr/xenomai)
+# We want $prefix to be set for the configure script
+if test x$prefix = xNONE; then
+   prefix=$ac_default_prefix
+fi
+
 version_code=`cat $srcdir/config/version-code`
 CONFIG_XENO_VERSION_MAJOR=`expr $version_code : '\([[0-9]]*\)'`
 CONFIG_XENO_VERSION_MINOR=`expr $version_code : '[[0-9]]*\.\([[0-9]]*\)'`
@@ -54,11 +64,6 @@ if eval test $includedir = /usr/include; then
   AC_MSG_ERROR([Using /usr/include as includedir is not supported. Please 
change your --prefix or specify another --includedir])
 fi
 
-AC_CONFIG_HEADERS(include/xeno_config.h)
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_MACRO_DIR([config])
-AC_CONFIG_SRCDIR(lib/cobalt/thread.c)
-AC_PREFIX_DEFAULT(/usr/xenomai)
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_PROG_INSTALL


___
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

[Xenomai-git] Philippe Gerum : cobalt/x86: upgrade I-pipe support

2015-03-03 Thread git repository hosting

Module: xenomai-3
Branch: next
Commit: 51680b1d9b3b1993011da1ddf56b54c12e59d49d
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=51680b1d9b3b1993011da1ddf56b54c12e59d49d

Author: Philippe Gerum r...@xenomai.org
Date:   Tue Mar  3 20:15:28 2015 +0100

cobalt/x86: upgrade I-pipe support

---

 16-x86-2.patch = ipipe-core-3.16-x86-3.patch} |   54 +++-
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/kernel/cobalt/arch/x86/patches/ipipe-core-3.16-x86-2.patch 
b/kernel/cobalt/arch/x86/patches/ipipe-core-3.16-x86-3.patch
similarity index 99%
rename from kernel/cobalt/arch/x86/patches/ipipe-core-3.16-x86-2.patch
rename to kernel/cobalt/arch/x86/patches/ipipe-core-3.16-x86-3.patch
index 18fa1fa..0fcf3fd 100644
--- a/kernel/cobalt/arch/x86/patches/ipipe-core-3.16-x86-2.patch
+++ b/kernel/cobalt/arch/x86/patches/ipipe-core-3.16-x86-3.patch
@@ -437,7 +437,7 @@ index 615fa90..e0a62ab 100644
  extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask,
 diff --git a/arch/x86/include/asm/ipipe.h b/arch/x86/include/asm/ipipe.h
 new file mode 100644
-index 000..7145c10
+index 000..68af8b7
 --- /dev/null
 +++ b/arch/x86/include/asm/ipipe.h
 @@ -0,0 +1,118 @@
@@ -467,7 +467,7 @@ index 000..7145c10
 +
 +#ifdef CONFIG_IPIPE
 +
-+#define IPIPE_CORE_RELEASE2
++#define IPIPE_CORE_RELEASE3
 +
 +struct ipipe_domain;
 +struct pt_regs;
@@ -2498,7 +2498,7 @@ index 1abcb50..dc6d438 100644
/*
 * When in-kernel, we also print out the stack and code at the
 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
-index 0d0c9d4..6e6b88a 100644
+index 0d0c9d4..e834437 100644
 --- a/arch/x86/kernel/entry_32.S
 +++ b/arch/x86/kernel/entry_32.S
 @@ -45,6 +45,7 @@
@@ -2616,7 +2616,7 @@ index 0d0c9d4..6e6b88a 100644
LOCKDEP_SYS_EXIT
DISABLE_INTERRUPTS(CLBR_ANY)
TRACE_IRQS_OFF
-@@ -443,6 +503,23 @@ sysenter_exit:
+@@ -443,6 +503,24 @@ sysenter_exit:
PTGS_TO_GS
ENABLE_INTERRUPTS_SYSEXIT
  
@@ -2634,13 +2634,14 @@ index 0d0c9d4..6e6b88a 100644
 +  jmp sysenter_exit
 +sysenter_exit_root:
 +  call __ipipe_root_sync
++  movl PT_EAX(%esp),%eax
 +  jmp sysenter_exit_check
 +#endif
 +
  #ifdef CONFIG_AUDITSYSCALL
  sysenter_audit:
testl $(_TIF_WORK_SYSCALL_ENTRY  ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
-@@ -495,6 +572,25 @@ ENTRY(system_call)
+@@ -495,6 +573,25 @@ ENTRY(system_call)
pushl_cfi %eax  # save orig_eax
SAVE_ALL
GET_THREAD_INFO(%ebp)
@@ -2666,7 +2667,7 @@ index 0d0c9d4..6e6b88a 100644
# system call tracing in operation / 
emulation
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
jnz syscall_trace_entry
-@@ -596,6 +692,7 @@ work_pending:
+@@ -596,6 +693,7 @@ work_pending:
testb $_TIF_NEED_RESCHED, %cl
jz work_notifysig
  work_resched:
@@ -2674,7 +2675,7 @@ index 0d0c9d4..6e6b88a 100644
call schedule
LOCKDEP_SYS_EXIT
DISABLE_INTERRUPTS(CLBR_ANY)# make sure we don't miss an interrupt
-@@ -611,6 +708,7 @@ work_resched:
+@@ -611,6 +709,7 @@ work_resched:
  
  work_notifysig:   # deal with pending signals and
# notify-resume requests
@@ -2682,7 +2683,7 @@ index 0d0c9d4..6e6b88a 100644
  #ifdef CONFIG_VM86
testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
movl %esp, %eax
-@@ -759,6 +857,58 @@ END(irq_entries_start)
+@@ -759,6 +858,58 @@ END(irq_entries_start)
  END(interrupt)
  .previous
  
@@ -2741,7 +2742,7 @@ index 0d0c9d4..6e6b88a 100644
  /*
   * the CPU automatically disables interrupts when executing an IRQ vector,
   * so IRQ-flags tracing has to follow that:
-@@ -788,6 +938,7 @@ ENTRY(name)\
+@@ -788,6 +939,7 @@ ENTRY(name)\
CFI_ENDPROC;\
  ENDPROC(name)
  
@@ -2749,7 +2750,7 @@ index 0d0c9d4..6e6b88a 100644
  
  #ifdef CONFIG_TRACING
  #define TRACE_BUILD_INTERRUPT(name, nr)   \
-@@ -1275,9 +1426,15 @@ error_code:
+@@ -1275,9 +1427,15 @@ error_code:
movl $(__USER_DS), %ecx
movl %ecx, %ds
movl %ecx, %es
@@ -2765,7 +2766,7 @@ index 0d0c9d4..6e6b88a 100644
jmp ret_from_exception
CFI_ENDPROC
  END(page_fault)
-@@ -1317,7 +1474,9 @@ ENTRY(debug)
+@@ -1317,7 +1475,9 @@ ENTRY(debug)
  debug_stack_correct:
pushl_cfi $-1   # mark this as an int
SAVE_ALL
@@ -2775,7 +2776,7 @@ index 0d0c9d4..6e6b88a 100644
xorl %edx,%edx  # error code 0
movl %esp,%eax  # pt_regs pointer
call do_debug
-@@ -1413,7 +1572,9 @@ ENTRY(int3)
+@@ -1413,7 +1573,9 @@ ENTRY(int3)
ASM_CLAC
pushl_cfi $-1   # mark this as an int
SAVE_ALL
@@ -15306,10 +15307,35 @@ index f802c2d..b320432 100644
  #ifdef finish_arch_post_lock_switch

[Xenomai-git] Philippe Gerum : copperplate/registry: execlp() is pointless with an absolute path

2015-03-03 Thread git repository hosting

Module: xenomai-3
Branch: next
Commit: da516f92036ed1a462ecafe4d78c2763e2b637ab
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=da516f92036ed1a462ecafe4d78c2763e2b637ab

Author: Philippe Gerum r...@xenomai.org
Date:   Tue Mar  3 15:10:21 2015 +0100

copperplate/registry: execlp() is pointless with an absolute path

---

 lib/copperplate/registry.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/copperplate/registry.c b/lib/copperplate/registry.c
index 92443e7..6d038f3 100644
--- a/lib/copperplate/registry.c
+++ b/lib/copperplate/registry.c
@@ -644,8 +644,8 @@ static int spawn_daemon(const char *sessdir)
pid = vfork();
switch (pid) {
case 0:
-   execlp(exec_path, sysregd, --daemon,
-  --root, sessdir, NULL);
+   execl(exec_path, sysregd, --daemon,
+ --root, sessdir, NULL);
_exit(1);
case -1:
sa.sa_handler = SIG_DFL;


___
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

[Xenomai-git] Philippe Gerum : build: make $prefix value available to configure script

[Xenomai-git] Philippe Gerum : cobalt/x86: upgrade I-pipe support

[Xenomai-git] Philippe Gerum : copperplate/registry: execlp() is pointless with an absolute path

3 matches

Site Navigation

Mail list logo

Footer information