tag 597932 + patch thanks Hi, attached a complete patch to fix compilation on both armel and hurd. I have a NMU ready, tell me if I should proceed with it or if you prefer to handle this.
Moreover, the patch for armel should really be sent upstream. Would you take care of this (if you are in touch with authors) or should I do it? Cheers, Luca -- .''`. ** Debian GNU/Linux ** | Luca Bruno (kaeso) : :' : The Universal O.S. | lucab (AT) debian.org `. `'` | GPG Key ID: 3BFB9FB3 `- http://www.debian.org | Debian GNU/Linux Developer
diffstat for openocd_0.4.0-1 openocd_0.4.0-1.1
debian/patches/register-command.diff | 91 +++++++++++++++++++++++++++++++++++
openocd-0.4.0/debian/changelog | 9 +++
openocd-0.4.0/debian/rules | 19 +++++--
3 files changed, 114 insertions(+), 5 deletions(-)
diff -u openocd-0.4.0/debian/changelog openocd-0.4.0/debian/changelog
--- openocd-0.4.0/debian/changelog
+++ openocd-0.4.0/debian/changelog
@@ -1,3 +1,12 @@
+openocd (0.4.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add patch to build ep93xx and at91rm9200 on armel (Closes: #597932).
+ * Disable parport, gw16012 and amtjtagaccel drivers on GNU/HURD,
+ rules snippet by Pino Toscano.
+
+ -- Luca Bruno <lu...@debian.org> Sat, 25 Sep 2010 20:26:48 +0200
+
openocd (0.4.0-1) unstable; urgency=low
* New upstream release (Closes: #564842).
diff -u openocd-0.4.0/debian/rules openocd-0.4.0/debian/rules
--- openocd-0.4.0/debian/rules
+++ openocd-0.4.0/debian/rules
@@ -20,8 +20,6 @@
DEB_CONFIGURE_EXTRA_FLAGS := \
--enable-maintainer-mode \
--disable-werror \
- --enable-parport \
- --enable-parport_ppdev \
--enable-ft2232_libftdi \
--enable-ep93xx \
--enable-at91rm9200 \
@@ -33,11 +31,22 @@
--enable-arm-jtag-ew \
--enable-dummy
-# Don't add --enable-gw16012 and --enable-amtjtagaccel on Debian GNU/kFreeBSD
-# as they're currently not supported there.
-ifneq (GNU/kFreeBSD, $(shell uname -s))
+configure_flags_parport := \
+ --enable-parport \
+ --enable-parport_ppdev
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+# Parport drivers only work on Linux and kFreeBSD, conditionally add them here
+DEB_CONFIGURE_EXTRA_FLAGS += $(configure_flags_parport)
+# Add --enable-gw16012 and --enable-amtjtagaccel only for Linux,
+# as they're currently supported there only.
DEB_CONFIGURE_EXTRA_FLAGS += --enable-gw16012 --enable-amtjtagaccel
endif
+
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+# Parport drivers only work on Linux and kFreeBSD, conditionally add them here
+DEB_CONFIGURE_EXTRA_FLAGS += $(configure_flags_parport)
+endif
### # We must first call ./bootstrap to generate the autotools stuff.
### post-patches:: debian/stamp-autothings-update
only in patch2:
unchanged:
--- openocd-0.4.0.orig/debian/patches/register-command.diff
+++ openocd-0.4.0/debian/patches/register-command.diff
@@ -0,0 +1,91 @@
+diff -Nur -x '*.orig' -x '*~' openocd-0.4.0//src/jtag/drivers/at91rm9200.c openocd-0.4.0.new//src/jtag/drivers/at91rm9200.c
+--- openocd-0.4.0//src/jtag/drivers/at91rm9200.c 2010-02-21 21:17:07.000000000 +0100
++++ openocd-0.4.0.new//src/jtag/drivers/at91rm9200.c 2010-09-26 17:28:06.975575833 +0200
+@@ -118,22 +118,9 @@
+ static void at91rm9200_reset(int trst, int srst);
+
+ static int at91rm9200_speed(int speed);
+-static int at91rm9200_register_commands(struct command_context *cmd_ctx);
+ static int at91rm9200_init(void);
+ static int at91rm9200_quit(void);
+
+-struct jtag_interface at91rm9200_interface =
+-{
+- .name = "at91rm9200",
+-
+- .execute_queue = bitbang_execute_queue,
+-
+- .speed = at91rm9200_speed,
+- .register_commands = at91rm9200_register_commands,
+- .init = at91rm9200_init,
+- .quit = at91rm9200_quit,
+-};
+-
+ static struct bitbang_interface at91rm9200_bitbang =
+ {
+ .read = at91rm9200_read,
+@@ -185,7 +172,7 @@
+ return ERROR_OK;
+ }
+
+-static int at91rm9200_handle_device_command(struct command_context *cmd_ctx, char *cmd, char **CMD_ARGV, int argc)
++COMMAND_HANDLER(at91rm9200_handle_device_command)
+ {
+ if (CMD_ARGC == 0)
+ return ERROR_OK;
+@@ -207,12 +194,20 @@
+ .mode = COMMAND_CONFIG,
+ .help = "query armjtagew info",
+ },
++ COMMAND_REGISTRATION_DONE
+ };
+
+-static int at91rm9200_register_commands(struct command_context *cmd_ctx)
++struct jtag_interface at91rm9200_interface =
+ {
+- return register_commands(cmd_ctx, NULL, at91rm9200_command_handlers);
+-}
++ .name = "at91rm9200",
++
++ .execute_queue = bitbang_execute_queue,
++
++ .speed = at91rm9200_speed,
++ .commands = at91rm9200_command_handlers,
++ .init = at91rm9200_init,
++ .quit = at91rm9200_quit,
++};
+
+ static int at91rm9200_init(void)
+ {
+diff -Nur -x '*.orig' -x '*~' openocd-0.4.0//src/jtag/drivers/ep93xx.c openocd-0.4.0.new//src/jtag/drivers/ep93xx.c
+--- openocd-0.4.0//src/jtag/drivers/ep93xx.c 2010-02-21 21:17:07.000000000 +0100
++++ openocd-0.4.0.new//src/jtag/drivers/ep93xx.c 2010-09-26 15:17:21.520076954 +0200
+@@ -47,7 +47,6 @@
+ static void ep93xx_reset(int trst, int srst);
+
+ static int ep93xx_speed(int speed);
+-static int ep93xx_register_commands(struct command_context *cmd_ctx);
+ static int ep93xx_init(void);
+ static int ep93xx_quit(void);
+
+@@ -60,7 +59,6 @@
+ .execute_queue = bitbang_execute_queue,
+
+ .speed = ep93xx_speed,
+- .register_commands = ep93xx_register_commands,
+ .init = ep93xx_init,
+ .quit = ep93xx_quit,
+ };
+@@ -120,12 +118,6 @@
+ {
+
+ return ERROR_OK;
+-}
+-
+-static int ep93xx_register_commands(struct command_context *cmd_ctx)
+-{
+-
+- return ERROR_OK;
+ }
+
+ static int set_gonk_mode(void)
signature.asc
Description: PGP signature
