[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [jenkins-ci PATCH 6/6] guests: Simplify FreeBSD symlink kludge



Now that we no longer support FreeBSD 10, we don't need
to special-case the readline symlinks.

Signed-off-by: Andrea Bolognani <abologna redhat com>
---
 guests/playbooks/update/tasks/kludges.yml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/guests/playbooks/update/tasks/kludges.yml b/guests/playbooks/update/tasks/kludges.yml
index f9127ac..c955a30 100644
--- a/guests/playbooks/update/tasks/kludges.yml
+++ b/guests/playbooks/update/tasks/kludges.yml
@@ -8,28 +8,15 @@
     state: link
     force: yes
   with_items:
+    - include/readline
     - include/sasl
     - include/yajl
+    - lib/libreadline.so
     - lib/libsasl2.so
     - lib/libyajl.so
   when:
     - os_name == 'FreeBSD'
 
-# Same as above, except we should skip it on FreeBSD 10 because it
-# shipped (an old version of) readline in the base system
-- name: Create compatibility symlinks
-  file:
-    src: '/usr/local/{{ item }}'
-    dest: '/usr/{{ item }}'
-    state: link
-    force: yes
-  with_items:
-    - include/readline
-    - lib/libreadline.so
-  when:
-    - os_name == 'FreeBSD'
-    - os_version != '10'
-
 # FreeBSD compiles bash without defining SSH_SOURCE_BASHRC, which means
 # it won't try to detect when it's spawned by ssh and source ~/.bashrc
 # when that's the case. Our workaround is setting $BASH_ENV globally
-- 
2.19.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]