diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-python/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/dev-python/.calculate_directory deleted file mode 100644 index 720d52e47..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/dev-python/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/.calculate_directory deleted file mode 100644 index 8340165e6..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate mergepkg()=>3.3,4 path=/usr/lib/python2.7/site-packages diff --git a/profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing b/profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing deleted file mode 100644 index 7083b1f42..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/dev-python/pexpect/fix_multiprocessing +++ /dev/null @@ -1,20 +0,0 @@ -# Calculate format=diff -index cace43b..ab2acaf 100644 ---- /usr/lib/python2.7/site-packages/pexpect/__init__.py -+++ /usr/lib/python2.7/site-packages/pexpect/__init__.py -@@ -490,10 +490,13 @@ class spawn(object): - # inherit EOF and INTR definitions from controlling process. - try: - from termios import VEOF, VINTR -- fd = sys.__stdin__.fileno() -+ try: -+ fd = sys.__stdin__.fileno() -+ except ValueError: -+ fd = sys.__stdout__.fileno() - self._INTR = ord(termios.tcgetattr(fd)[6][VINTR]) - self._EOF = ord(termios.tcgetattr(fd)[6][VEOF]) -- except (ImportError, OSError, IOError, termios.error): -+ except (ImportError, OSError, ValueError, IOError, termios.error): - # unless the controlling process is also not a terminal, - # such as cron(1). Fall-back to using CEOF and CINTR. - try: diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch deleted file mode 100644 index df3dec502..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -# Calculate format=diff pkg(sys-apps/calculate-utils)<3.4.1 -Поддержка названия gentoo для /usr/portage - ---- /usr/lib/python2.7/site-packages/calculate/builder/builder.py -+++ /usr/lib/python2.7/site-packages/calculate/builder/builder.py -@@ -149,7 +149,7 @@ class Builder(Update): - self.clVars.Get('update.cl_update_layman_make'), - self.clVars.Get('update.cl_update_layman_conf'), - prefix=self.clVars.Get('cl_builder_path')) -- if repname != "portage": -+ if repname not in ("portage", "gentoo"): - layman.remove(repname, rpath_orig) - removeDir(rpath) - return True ---- /usr/lib/python2.7/site-packages/calculate/update/update.py -+++ /usr/lib/python2.7/site-packages/calculate/update/update.py -@@ -293,7 +293,7 @@ class Update(object): - dv.Get('cl_update_layman_make'), - dv.Get('cl_update_layman_conf'), - prefix=chroot_path) -- if repname != "portage": -+ if repname not in ("portage", "gentoo"): - layman.add(repname, url, rpath_orig) - if not self._syncRepository(repname, url, rpath, revision, - cb_progress=self.setProgress): -@@ -328,7 +328,7 @@ class Update(object): - dv.Get('cl_update_layman_make'), - dv.Get('cl_update_layman_conf'), - prefix=chroot_path) -- if repname != "portage": -+ if repname not in ("portage", "gentoo"): - # TODO: debug block - #print "EEEE",repname, url, rpath_orig - layman.add(repname, url, rpath_orig) -@@ -340,7 +340,7 @@ class Update(object): - """ - Спрятать кэш - """ -- if name in ("portage",): -+ if name in ("portage", "gentoo"): - return - if not name in OverlayOwnCache(self.clVars): - for cachename in self.metadata_cache_names: -@@ -360,7 +360,7 @@ class Update(object): - """ - Извлеч кэш - """ -- if name in ("portage",): -+ if name in ("portage", "gentoo"): - return - cachenames = self.metadata_cache_names - if not name in OverlayOwnCache(self.clVars): diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch deleted file mode 100644 index 65d3eb833..000000000 --- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/portage_gentoo.3.4.5.27.patch +++ /dev/null @@ -1,66 +0,0 @@ -# Calculate format=diff pkg(sys-apps/calculate-utils)==3.4.1,3.4.5.28 -Поддержка названия gentoo для /usr/portage - ---- /usr/lib/python2.7/site-packages/calculate/builder/builder.py -+++ /usr/lib/python2.7/site-packages/calculate/builder/builder.py -@@ -162,7 +162,7 @@ class Builder(Update): - self.clVars.Get('update.cl_update_layman_make'), - self.clVars.Get('update.cl_update_layman_conf'), - prefix=self.clVars.Get('cl_builder_path')) -- if repname != "portage": -+ if repname not in ("gentoo", "portage"): - layman.remove(repname, rpath_orig) - removeDir(rpath) - return True ---- /usr/lib/python2.7/site-packages/calculate/update/update.py -+++ /usr/lib/python2.7/site-packages/calculate/update/update.py -@@ -328,7 +328,7 @@ class Update(MethodsInterface): - dv.Get('cl_update_layman_make'), - dv.Get('cl_update_layman_conf'), - prefix=chroot_path) -- if repname != "portage": -+ if repname not in ("portage", "gentoo"): - layman.add(repname, url, rpath_orig) - if not self._syncRepository(repname, url, rpath, revision, - cb_progress=self.setProgress, -@@ -367,7 +367,7 @@ class Update(MethodsInterface): - dv.Get('cl_update_layman_make'), - dv.Get('cl_update_layman_conf'), - prefix=chroot_path) -- if repname != "portage": -+ if repname not in ("portage", "gentoo"): - layman.add(repname, url, rpath_orig) - finally: - mtime.restore() -@@ -379,7 +379,7 @@ class Update(MethodsInterface): - """ - Спрятать кэш - """ -- if name in ("portage",): -+ if name in ("portage", "gentoo"): - return - if not name in OverlayOwnCache(self.clVars): - for cachename in self.metadata_cache_names: -@@ -399,7 +399,7 @@ class Update(MethodsInterface): - """ - Извлеч кэш - """ -- if name in ("portage",): -+ if name in ("portage", "gentoo"): - return - cachenames = self.metadata_cache_names - if not name in OverlayOwnCache(self.clVars): -diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py -index 35bd04a..e40a112 100644 ---- /usr/lib/python2.7/site-packages/calculate/update/variables/update.py -+++ /usr/lib/python2.7/site-packages/calculate/update/variables/update.py -@@ -470,7 +470,8 @@ class VariableClUpdateSyncOverlayRep(ReadonlyVariable): - type = "list" - - def get(self): -- return filter(lambda x: x != "portage", self.Get('cl_update_sync_rep')) -+ return filter(lambda x: x not in ("portage", "gentoo"), -+ self.Get('cl_update_sync_rep')) - - - class VariableClUpdateOutdateSet(ReadonlyVariable): diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia index f06892483..c758d10e7 100644 --- a/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia +++ b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/99nvidia @@ -3,7 +3,8 @@ # for some applications (chromium,libreoffice and etc) #?os_install_arch_machine==x86_64# PRELINK_PATH_MASK="/usr/lib64/*nvidia* --b /usr/lib32/*nvidia*" +-b /usr/lib32/*nvidia* +-b /usr/lib/*nvidia*" #!os_install_arch_machine# PRELINK_PATH_MASK=/usr/lib/*nvidia* #os_install_arch_machine# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf index 0557a8fdf..24fb78327 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/net-nds/openldap/1-ldap/slapd.conf @@ -11,7 +11,12 @@ argsfile /var/run/openldap/slapd.arg # Уровень отладочных сообщений loglevel 0 allow bind_v2 +#?os_install_arch_machine==i686# modulepath /usr/lib/openldap/openldap +#os_install_arch_machine# +#?os_install_arch_machine==x86_64# +modulepath /usr/lib64/openldap/openldap +#os_install_arch_machine# database bdb suffix "#-ld_base_dn-#" diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf index 47e514c82..fe498a091 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-devel/prelink/dbus.conf @@ -3,4 +3,5 @@ -b /usr/lib64/libdbus-* -b /usr/lib/libdbus-* -b /usr/lib64/libdbusmenu-qt.so* +-b /usr/lib32/libdbusmenu-qt.so* -b /usr/lib/libdbusmenu-qt.so*