From 1172e6336958a2ade21ba1b867da0be55be9319c Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Fri, 8 May 2009 08:18:33 -0400 Subject: [PATCH] hal: Updated (0.5.9.1 -> 0.5.11) --- .../hal/hal-0.5.7.1-linux-header-2.6.18.patch | 38 ------------------- base/hal/hal.desc | 6 +-- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 base/hal/hal-0.5.7.1-linux-header-2.6.18.patch diff --git a/base/hal/hal-0.5.7.1-linux-header-2.6.18.patch b/base/hal/hal-0.5.7.1-linux-header-2.6.18.patch deleted file mode 100644 index 1f6b6c631..000000000 --- a/base/hal/hal-0.5.7.1-linux-header-2.6.18.patch +++ /dev/null @@ -1,38 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../hal/hal-0.5.7.1-linux-header-2.6.18.patch -# Copyright (C) 2006 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./hald/linux/probing/linux_dvd_rw_utils.c.orig 2006-09-29 23:14:00.000000000 +0200 -+++ ./hald/linux/probing/linux_dvd_rw_utils.c 2006-09-29 23:26:04.000000000 +0200 -@@ -149,8 +149,8 @@ - errno = EIO; - ret = -1; - if (cmd->sg_io.masked_status & CHECK_CONDITION) { -- CREAM_ON_ERRNO (cmd->sg_io.sbp); -- ret = ERRCODE (cmd->sg_io.sbp); -+ CREAM_ON_ERRNO (((unsigned char *)cmd->sg_io.sbp)); -+ ret = ERRCODE (((unsigned char *)cmd->sg_io.sbp)); - if (ret == 0) - ret = -1; - } -@@ -172,7 +172,7 @@ - cmd->sg_io.mx_sb_len = sizeof (cmd->_sense); - cmd->sg_io.cmdp = cmd->cgc.cmd; - cmd->sg_io.sbp = cmd->_sense.u; -- cmd->sg_io.flags = SG_FLAG_LUN_INHIBIT | SG_FLAG_DIRECT_IO; -+ cmd->sg_io.flags = SG_FLAG_UNUSED_LUN_INHIBIT | SG_FLAG_DIRECT_IO; - } - cmd->sg_io.cmd_len = i + 1; - cmd->cgc.cmd[i] = arg; diff --git a/base/hal/hal.desc b/base/hal/hal.desc index 0a2ba3a7c..3d48d7a78 100644 --- a/base/hal/hal.desc +++ b/base/hal/hal.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../hal/hal.desc -[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -30,7 +30,7 @@ [L] GPL [S] Alpha -[V] 0.5.9.1 +[V] 0.5.11 [P] X -----5---9 112.500 -[D] 4213366806 hal-0.5.9.1.tar.gz http://freedesktop.org/~david/dist/ +[D] 3210831150 hal-0.5.11.tar.gz http://hal.freedesktop.org/releases/