From 7047b7a27c2da6e76b0b9bcab8504bb8876f7f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 19 Apr 2016 17:02:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=B8=D0=B1=D0=BB?= =?UTF-8?q?=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=20dbus=20=D0=B2=20prelink?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf | 6 ++++++ profiles/templates/3.3/6_ac_update_sync/remerge/00-ini | 2 +- profiles/templates/3.3/6_ac_update_sync/remerge/101-200/110 | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf create mode 100644 profiles/templates/3.3/6_ac_update_sync/remerge/101-200/110 diff --git a/profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf new file mode 100644 index 000000000..47e514c82 --- /dev/null +++ b/profiles/templates/3.3/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf @@ -0,0 +1,6 @@ +# Calculate comment=# path=/etc/prelink.conf.d +-b /usr/lib32/libdbus-* +-b /usr/lib64/libdbus-* +-b /usr/lib/libdbus-* +-b /usr/lib64/libdbusmenu-qt.so* +-b /usr/lib/libdbusmenu-qt.so* diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini index 821cfd7c1..a85486e54 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 109 +remerge = 110 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/101-200/110 b/profiles/templates/3.3/6_ac_update_sync/remerge/101-200/110 new file mode 100644 index 000000000..869d0e6c6 --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/101-200/110 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-devel/prelink ini(overlay-calculate.remerge)<110 + +[overlay-calculate] +remerge = 110