summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2019-10-05 11:17:50 +0200
committerSuren A. Chilingaryan <csa@suren.me>2019-10-05 11:17:50 +0200
commit1c3a5b60c8dcaa3b941d539d4323e5cd43585a85 (patch)
treeb11d0233d84c0c31cd215c560125b91ea5d59ae9
parentf18d78bb5330bf8916f9785cea22a74dcc1531c9 (diff)
downloadadei-1c3a5b60c8dcaa3b941d539d4323e5cd43585a85.tar.gz
adei-1c3a5b60c8dcaa3b941d539d4323e5cd43585a85.tar.bz2
adei-1c3a5b60c8dcaa3b941d539d4323e5cd43585a85.tar.xz
adei-1c3a5b60c8dcaa3b941d539d4323e5cd43585a85.zip
Include gconv-modules from glibc-locales (otherwise, freetds crashes)
-rw-r--r--docker-compose.yml17
-rw-r--r--kiwi/adei/config.sh17
-rw-r--r--kiwi/adei/config.xml1
-rw-r--r--kiwi/adei/root/patches/gconv/gconv-modules99
4 files changed, 122 insertions, 12 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 307ef42..44eeea1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -53,7 +53,7 @@ services:
ports:
- 81:81
- tango_backend:
+ darwin_backend:
image: chsa/adei:latest
tty: true
entrypoint: /opt/scripts/run-cron.sh
@@ -63,13 +63,13 @@ services:
links:
- mysql:adei-mysql
environment:
- - ADEI_ENABLED_SETUPS=tango
- - MYSQL_DATABASE=adei_tango
+ - ADEI_ENABLED_SETUPS=darwin
+ - MYSQL_DATABASE=adei_darwin
ports: []
cpu_quota: 10000
- tango_frontend:
+ darwin_frontend:
image: chsa/adei:latest
tty: true
entrypoint: /opt/scripts/run-apache.sh
@@ -79,9 +79,9 @@ services:
links:
- mysql:adei-mysql
environment:
- - ADEI_SETUP=tango
+ - ADEI_SETUP=darwin
- ADEI_PORTS=82
- - MYSQL_DATABASE=adei_tango
+ - MYSQL_DATABASE=adei_darwin
ports:
- 82:82
@@ -99,7 +99,7 @@ services:
ports:
- 79:79
- mini:
+ darwin_mini:
image: chsa/adei-minimal:latest
tty: true
entrypoint: /bin/bash
@@ -109,7 +109,8 @@ services:
links:
- mysql:adei-mysql
environment:
- - ADEI_ENABLED_SETUPS=autogen
+ - ADEI_ENABLED_SETUPS=darwin
+ - MYSQL_DATABASE=adei_darwin
volumes:
db:
diff --git a/kiwi/adei/config.sh b/kiwi/adei/config.sh
index 57075fc..2f25c1e 100644
--- a/kiwi/adei/config.sh
+++ b/kiwi/adei/config.sh
@@ -93,13 +93,22 @@ rm -f /etc/machine-id
# DS, this is called before 'delete' configured in 'config.xml'. So, we can't clean if removing from there
rpm -e --nodeps dbus-1 dracut fipscheck libfipscheck1 kbd kmod kmod-compat pinentry pkg-config exim \
- udev systemd systemd-sysvinit logrotate device-mapper libcryptsetup4 libdb-4_8 \
+ udev systemd systemd-sysvinit logrotate device-mapper libcryptsetup4 \
cracklib cracklib-dict-full libcrack2 pam pam-config shadow util-linux aaa_base netcfg \
- ca-certificates openSUSE-build-key dirmngr perl-base insserv-compat \
- gpg2 openssl libncurses6 file file-magic libmagic1 libsolv-tools suse-module-tools \
- libzypp zypper rpm
+ ca-certificates openSUSE-build-key dirmngr insserv-compat libncurses6 \
+ libzypp zypper rpm libdb-4_8 file file-magic libmagic1 perl-base libsolv-tools suse-module-tools gpg2 openssl
find . -name *.rpmsave -delete
rm -rf /var/lib/rpm
+rm -rf /usr/share/locale
+rm -rf /usr/lib/locale
+mv /usr/lib64/gconv/{UTF-16,UTF-32,UNICODE,MAC-CENTRALEUROPE}.so /patches/gconv/
+mv /usr/lib64/gconv/ISO8859-{1,2,3,4}.so /patches/gconv/
+rm -rf /usr/lib64/gconv/
+mv /patches/gconv /usr/lib64
+
+rm -rf /patches
+
+
exit 0
diff --git a/kiwi/adei/config.xml b/kiwi/adei/config.xml
index 6122ab0..cb454ce 100644
--- a/kiwi/adei/config.xml
+++ b/kiwi/adei/config.xml
@@ -50,5 +50,6 @@
<package name="openSUSE-release-ftp"/>
<package name="adei-req-cron"/>
<package name="adei-req-mssql"/>
+ <package name="glibc-locale"/>
</packages>
</image>
diff --git a/kiwi/adei/root/patches/gconv/gconv-modules b/kiwi/adei/root/patches/gconv/gconv-modules
new file mode 100644
index 0000000..c8c468b
--- /dev/null
+++ b/kiwi/adei/root/patches/gconv/gconv-modules
@@ -0,0 +1,99 @@
+# from to module cost
+alias ISO-IR-100// ISO-8859-1//
+alias ISO_8859-1:1987// ISO-8859-1//
+alias ISO_8859-1// ISO-8859-1//
+alias ISO8859-1// ISO-8859-1//
+alias ISO88591// ISO-8859-1//
+alias LATIN1// ISO-8859-1//
+alias L1// ISO-8859-1//
+alias IBM819// ISO-8859-1//
+alias CP819// ISO-8859-1//
+alias CSISOLATIN1// ISO-8859-1//
+alias 8859_1// ISO-8859-1//
+alias OSF00010001// ISO-8859-1//
+module ISO-8859-1// INTERNAL ISO8859-1 1
+module INTERNAL ISO-8859-1// ISO8859-1 1
+
+# from to module cost
+alias ISO-IR-101// ISO-8859-2//
+alias ISO_8859-2:1987// ISO-8859-2//
+alias ISO_8859-2// ISO-8859-2//
+alias ISO8859-2// ISO-8859-2//
+alias ISO88592// ISO-8859-2//
+alias LATIN2// ISO-8859-2//
+alias L2// ISO-8859-2//
+alias CSISOLATIN2// ISO-8859-2//
+alias 8859_2// ISO-8859-2//
+alias OSF00010002// ISO-8859-2//
+alias IBM912// ISO-8859-2//
+alias CP912// ISO-8859-2//
+module ISO-8859-2// INTERNAL ISO8859-2 1
+module INTERNAL ISO-8859-2// ISO8859-2 1
+
+# from to module cost
+alias ISO-IR-109// ISO-8859-3//
+alias ISO_8859-3:1988// ISO-8859-3//
+alias ISO_8859-3// ISO-8859-3//
+alias ISO8859-3// ISO-8859-3//
+alias ISO88593// ISO-8859-3//
+alias LATIN3// ISO-8859-3//
+alias L3// ISO-8859-3//
+alias CSISOLATIN3// ISO-8859-3//
+alias 8859_3// ISO-8859-3//
+alias OSF00010003// ISO-8859-3//
+module ISO-8859-3// INTERNAL ISO8859-3 1
+module INTERNAL ISO-8859-3// ISO8859-3 1
+
+# from to module cost
+alias ISO-IR-110// ISO-8859-4//
+alias ISO_8859-4:1988// ISO-8859-4//
+alias ISO_8859-4// ISO-8859-4//
+alias ISO8859-4// ISO-8859-4//
+alias ISO88594// ISO-8859-4//
+alias LATIN4// ISO-8859-4//
+alias L4// ISO-8859-4//
+alias CSISOLATIN4// ISO-8859-4//
+alias 8859_4// ISO-8859-4//
+alias OSF00010004// ISO-8859-4//
+module ISO-8859-4// INTERNAL ISO8859-4 1
+module INTERNAL ISO-8859-4// ISO8859-4 1
+
+
+alias CP1282// MAC-CENTRALEUROPE//
+module MAC-CENTRALEUROPE// INTERNAL MAC-CENTRALEUROPE 1
+module INTERNAL MAC-CENTRALEUROPE// MAC-CENTRALEUROPE 1
+
+# from to module cost
+alias UTF16// UTF-16//
+module UTF-16// INTERNAL UTF-16 1
+module INTERNAL UTF-16// UTF-16 1
+
+# from to module cost
+alias UTF16LE// UTF-16LE//
+module UTF-16LE// INTERNAL UTF-16 1
+module INTERNAL UTF-16LE// UTF-16 1
+
+# from to module cost
+alias UTF16BE// UTF-16BE//
+module UTF-16BE// INTERNAL UTF-16 1
+module INTERNAL UTF-16BE// UTF-16 1
+
+# from to module cost
+alias CSUNICODE// UNICODE//
+module UNICODE// INTERNAL UNICODE 1
+module INTERNAL UNICODE// UNICODE 1
+
+# from to module cost
+alias UTF32// UTF-32//
+module UTF-32// INTERNAL UTF-32 1
+module INTERNAL UTF-32// UTF-32 1
+
+# from to module cost
+alias UTF32LE// UTF-32LE//
+module UTF-32LE// INTERNAL UTF-32 1
+module INTERNAL UTF-32LE// UTF-32 1
+
+# from to module cost
+alias UTF32BE// UTF-32BE//
+module UTF-32BE// INTERNAL UTF-32 1
+module INTERNAL UTF-32BE// UTF-32 1