Bug#398158: PATCH: generic arch support
Package: inotify-tools
Version: 2.6-1
Followup-For: Bug #398158
LaMont Jones mentioned on irc that the missing architecture support is
a more general problem of inotify-tools and that the system header should
be used instead of the internal one.
So I tested this (successfully) using <asm/unistd.h> on amd64 amd
m68k. Patch attached.
MfG
Goswin
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.8-frosties-2
Locale: LANG=C, LC_CTYPE=de_DE (charmap=ISO-8859-1)
diff -Nru /tmp/2G2xp4Mzzc/inotify-tools-2.6/config.sub /tmp/jGnFv4ykqf/inotify-tools-2.6/config.sub
--- /tmp/2G2xp4Mzzc/inotify-tools-2.6/config.sub 2006-11-12 06:02:05.000000000 +0100
+++ /tmp/jGnFv4ykqf/inotify-tools-2.6/config.sub 2006-11-12 06:02:05.000000000 +0100
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -367,7 +368,7 @@
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1366,6 +1371,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
diff -Nru /tmp/2G2xp4Mzzc/inotify-tools-2.6/debian/changelog /tmp/jGnFv4ykqf/inotify-tools-2.6/debian/changelog
--- /tmp/2G2xp4Mzzc/inotify-tools-2.6/debian/changelog 2006-11-12 06:02:05.000000000 +0100
+++ /tmp/jGnFv4ykqf/inotify-tools-2.6/debian/changelog 2006-11-12 06:02:05.000000000 +0100
@@ -1,3 +1,9 @@
+inotify-tools (2.6-1a0.mrvn.1) unstable; urgency=low
+
+ * Use <asm/unistd.h> for syscall numbers
+
+ -- Goswin von Brederlow <brederlo@informatik.uni-tuebingen.de> Sun, 12 Nov 2006 05:43:02 +0100
+
inotify-tools (2.6-1) unstable; urgency=low
* Initial release (Closes: #394249)
diff -Nru /tmp/2G2xp4Mzzc/inotify-tools-2.6/src/inotify-syscalls.h /tmp/jGnFv4ykqf/inotify-tools-2.6/src/inotify-syscalls.h
--- /tmp/2G2xp4Mzzc/inotify-tools-2.6/src/inotify-syscalls.h 2006-10-01 00:46:06.000000000 +0200
+++ /tmp/jGnFv4ykqf/inotify-tools-2.6/src/inotify-syscalls.h 2006-11-12 06:02:05.000000000 +0100
@@ -10,7 +10,9 @@
#include <sys/syscall.h>
#include <unistd.h>
+#include <asm/unistd.h>
+#if 0
#if defined (__alpha__)
# define __NR_inotify_init 444
# define __NR_inotify_add_watch 445
@@ -91,6 +93,18 @@
#else
# error "Unsupported architecture!"
#endif
+#endif
+
+#ifndef __NR_inotify_init
+# error "Unsupported architecture!"
+#endif
+#ifndef __NR_inotify_add_watch
+# error "Unsupported architecture!"
+#endif
+#ifndef __NR_inotify_rm_watch
+# error "Unsupported architecture!"
+#endif
+
static inline int inotify_init (void)
{
Reply to: