|
 |
ab36df |
From f4319839a1cef860a8943c74032fdbf023f13104 Mon Sep 17 00:00:00 2001
|
|
|
ab36df |
From: Dominic Cleal <dcleal@redhat.com>
|
|
|
ab36df |
Date: Mon, 2 Jun 2014 13:25:09 +0100
|
|
|
ab36df |
Subject: [PATCH] Ldso: handle "hwcap" lines
|
|
|
ab36df |
|
|
|
ab36df |
Fixes #100
|
|
|
ab36df |
|
|
|
ab36df |
(cherry picked from commit a8bd97a2a336319220eab92268ccb3029627ae86)
|
|
|
ab36df |
|
|
|
ab36df |
Conflicts:
|
|
|
ab36df |
NEWS
|
|
|
ab36df |
---
|
|
|
ab36df |
lenses/ldso.aug | 8 +++++++-
|
|
|
ab36df |
lenses/tests/test_ldso.aug | 6 ++++++
|
|
|
ab36df |
2 files changed, 13 insertions(+), 1 deletion(-)
|
|
|
ab36df |
|
|
|
ab36df |
diff --git a/lenses/ldso.aug b/lenses/ldso.aug
|
|
|
ab36df |
index ef0ee4c..d362573 100644
|
|
|
ab36df |
--- a/lenses/ldso.aug
|
|
|
ab36df |
+++ b/lenses/ldso.aug
|
|
|
ab36df |
@@ -27,8 +27,14 @@ let path = [ label "path" . store /[^# \t\n][^ \t\n]*/ . Util.eol ]
|
|
|
ab36df |
(* View: include *)
|
|
|
ab36df |
let include = Build.key_value_line "include" Sep.space (store Rx.fspath)
|
|
|
ab36df |
|
|
|
ab36df |
+(* View: hwcap *)
|
|
|
ab36df |
+let hwcap =
|
|
|
ab36df |
+ let hwcap_val = [ label "bit" . store Rx.integer ] . Sep.space .
|
|
|
ab36df |
+ [ label "name" . store Rx.word ]
|
|
|
ab36df |
+ in Build.key_value_line "hwcap" Sep.space hwcap_val
|
|
|
ab36df |
+
|
|
|
ab36df |
(* View: lns *)
|
|
|
ab36df |
-let lns = (Util.empty | Util.comment | path | include)*
|
|
|
ab36df |
+let lns = (Util.empty | Util.comment | path | include | hwcap)*
|
|
|
ab36df |
|
|
|
ab36df |
(* Variable: filter *)
|
|
|
ab36df |
let filter = incl "/etc/ld.so.conf"
|
|
|
ab36df |
diff --git a/lenses/tests/test_ldso.aug b/lenses/tests/test_ldso.aug
|
|
|
ab36df |
index 5270f25..70ee07d 100644
|
|
|
ab36df |
--- a/lenses/tests/test_ldso.aug
|
|
|
ab36df |
+++ b/lenses/tests/test_ldso.aug
|
|
|
ab36df |
@@ -10,6 +10,8 @@ let conf = "include /etc/ld.so.conf.d/*.conf
|
|
|
ab36df |
|
|
|
ab36df |
# libc default configuration
|
|
|
ab36df |
/usr/local/lib
|
|
|
ab36df |
+
|
|
|
ab36df |
+hwcap 1 nosegneg
|
|
|
ab36df |
"
|
|
|
ab36df |
|
|
|
ab36df |
(* Test: Ldso.lns *)
|
|
|
ab36df |
@@ -18,3 +20,7 @@ test Ldso.lns get conf =
|
|
|
ab36df |
{ }
|
|
|
ab36df |
{ "#comment" = "libc default configuration" }
|
|
|
ab36df |
{ "path" = "/usr/local/lib" }
|
|
|
ab36df |
+ { }
|
|
|
ab36df |
+ { "hwcap"
|
|
|
ab36df |
+ { "bit" = "1" }
|
|
|
ab36df |
+ { "name" = "nosegneg" } }
|