From patchwork Sat Jun 23 16:36:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregor Jasny X-Patchwork-Id: 13041 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SiTLD-0002xQ-31 for patchwork@linuxtv.org; Sat, 23 Jun 2012 18:37:43 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SiTLC-0001Cp-F7; Sat, 23 Jun 2012 18:37:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755403Ab2FWQhk (ORCPT ); Sat, 23 Jun 2012 12:37:40 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:60850 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755228Ab2FWQh2 (ORCPT ); Sat, 23 Jun 2012 12:37:28 -0400 Received: by mail-bk0-f46.google.com with SMTP id ji2so2283417bkc.19 for ; Sat, 23 Jun 2012 09:37:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=TEvyCy8Y32aDW+xiGRKMpULAkV81Ie/h8IPiX/QFJCQ=; b=Mi5M4Wu8bl8A6ULm9HLvRHNUv0yrexWWqbkxDBZ0DjAHzjKQosfXraRDvps6H2DgtS jgf85mc/Ze6FEWbFRRAtpxRbNksQqdh0/Kke/drOigGRi50syB+wLuSESM343vZyWclQ 0t3ZUsJgd+/v7WJ75MSEHVMLXLoeqHKuD2c+atvH3u4aPN5xIbZoQ2v422Xa15Xuciaf 00/x0KaePcIZuxRM0QNtXhlOydlKHlo2c59gp0oF6amAmsROOZIvsOxmAMDptbC08MCQ O2xr12jHZdAKEgzvrD01Lj/UxUC69uuDasJgBxel+lYtHBlcA1fNBjLINJjN+zeKy3Nx 2kgg== Received: by 10.204.154.140 with SMTP id o12mr2101193bkw.139.1340469448152; Sat, 23 Jun 2012 09:37:28 -0700 (PDT) Received: from sid.fritz.box (f053083223.adsl.alicedsl.de. [78.53.83.223]) by mx.google.com with ESMTPS id ie3sm39873527bkc.1.2012.06.23.09.37.25 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 23 Jun 2012 09:37:27 -0700 (PDT) From: Gregor Jasny To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, Gregor Jasny Subject: [PATCH 2/3] keytable: Preinstall keytables relative to sysconfdir Date: Sat, 23 Jun 2012 18:36:46 +0200 Message-Id: <1340469407-25580-3-git-send-email-gjasny@googlemail.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1340469407-25580-1-git-send-email-gjasny@googlemail.com> References: <1340469407-25580-1-git-send-email-gjasny@googlemail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.6.23.162422 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Signed-off-by: Gregor Jasny --- configure.ac | 5 +++-- utils/keytable/Makefile.am | 5 ++--- utils/keytable/keytable.c | 7 ++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 1a12abd..661eb20 100644 --- a/configure.ac +++ b/configure.ac @@ -153,7 +153,7 @@ libv4l2privdir="$libdir/$libv4l2subdir" libv4l2plugindir="$libv4l2privdir/plugins" libv4lconvertprivdir="$libdir/$libv4lconvertsubdir" -rootetcdir="/etc" +keytablesystemdir="$sysconfdir/rc_keymaps" udevrulesdir="$udevdir/rules.d" pkgconfigdir="$libdir/pkgconfig" @@ -161,7 +161,7 @@ AC_SUBST(libv4l1privdir) AC_SUBST(libv4l2privdir) AC_SUBST(libv4l2plugindir) AC_SUBST(libv4lconvertprivdir) -AC_SUBST(rootetcdir) +AC_SUBST(keytablesystemdir) AC_SUBST(udevrulesdir) AC_SUBST(pkgconfigdir) @@ -170,6 +170,7 @@ AC_DEFINE_DIR([LIBV4L1_PRIV_DIR], [libv4l1privdir], [libv4l1 private lib directo AC_DEFINE_DIR([LIBV4L2_PRIV_DIR], [libv4l2privdir], [libv4l2 private lib directory]) AC_DEFINE_DIR([LIBV4L2_PLUGIN_DIR], [libv4l2plugindir], [libv4l2 plugin directory]) AC_DEFINE_DIR([LIBV4LCONVERT_PRIV_DIR], [libv4lconvertprivdir], [libv4lconvert private lib directory]) +AC_DEFINE_DIR([IR_KEYTABLE_SYSTEM_DIR], [keytablesystemdir], [ir-keytable preinstalled tables directory]) # options diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am index 3d510e0..4505fc1 100644 --- a/utils/keytable/Makefile.am +++ b/utils/keytable/Makefile.am @@ -1,8 +1,7 @@ -rootetcdir="/etc" - bin_PROGRAMS = ir-keytable man_MANS = ir-keytable.1 -nobase_rootetc_DATA = rc_maps.cfg $(srcdir)/rc_keymaps/* +sysconf_DATA = rc_maps.cfg +keytablesystem_DATA = $(srcdir)/rc_keymaps/* udevrules_DATA = 70-infrared.rules ir_keytable_SOURCES = keytable.c parse.h diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c index fbf9c03..31376f3 100644 --- a/utils/keytable/keytable.c +++ b/utils/keytable/keytable.c @@ -28,9 +28,6 @@ #include "parse.h" -/* Default place where the keymaps will be stored */ -#define CFGDIR "/etc/rc_keymaps" - struct input_keymap_entry_v2 { #define KEYMAP_BY_INDEX (1 << 0) u_int8_t flags; @@ -1516,8 +1513,8 @@ int main(int argc, char *argv[]) if (cur->fname[0] == '/' || ((cur->fname[0] == '.') && strchr(cur->fname, '/'))) { fname = cur->fname; } else { - fname = malloc(strlen(cur->fname) + strlen(CFGDIR) + 2); - strcpy(fname, CFGDIR); + fname = malloc(strlen(cur->fname) + strlen(IR_KEYTABLE_SYSTEM_DIR) + 2); + strcpy(fname, IR_KEYTABLE_SYSTEM_DIR); strcat(fname, "/"); strcat(fname, cur->fname); }