diff options
| author | Christophe Monniez <moc@odoo.com> | 2021-01-28 11:05:09 +0000 |
|---|---|---|
| committer | Christophe Monniez <moc@odoo.com> | 2021-01-29 10:45:09 +0000 |
| commit | a8deb1dd433e3a1690d593e83ade6af46326a26b (patch) | |
| tree | e7fb677c799633e3cdfe892882e8602e1bc589a9 /setup/redhat | |
| parent | 73ddcfbcc58b7a6542ced4bd8b20dd67c9f446ee (diff) | |
[FIX] packaging: update rpm packaging for fedora 32
As Fedora 32 was the current release when Odoo 14.0 was released, this
should be the supported version.
Also, a few old libs were still in mentioned in the packaging files.
They flew under the radar because they never broke the packaging.
This is not the case anymore, those libs disappeared from the Fedora
repos.
It seems that pyparsing is not used anymore since 5a1c06a19 and thus can
be safely removed from `requirements.txt` too.
pychart is not used anymore since 3425752ea.
While at it, remove mix of tabs and spaces in package.dffedora, also add
missing packages to avoid installation at test time.
Now that I started down the slippery slope, also removed some `-dev`
packages in package.dfsrc as wheel's are available.
Finally, the rpm install script now detects the python ABI version in
order to avoid update this file at each ABI change in Fedora.
Fixes #63719
closes odoo/odoo#65224
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
Diffstat (limited to 'setup/redhat')
| -rw-r--r-- | setup/redhat/install.sh | 3 | ||||
| -rw-r--r-- | setup/redhat/postinstall.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/setup/redhat/install.sh b/setup/redhat/install.sh index b7a7f3eb40d..d02f6f28c68 100644 --- a/setup/redhat/install.sh +++ b/setup/redhat/install.sh @@ -1,3 +1,4 @@ #!/bin/sh set -e -python3 setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib usr/lib/python3.7/site-packages/ +ABI=$(rpm -q --provides python3 | awk '/abi/ {print $NF}') +python3 setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib usr/lib/python${ABI}/site-packages/ diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh index c14dd9a55a4..82d31f09ead 100644 --- a/setup/redhat/postinstall.sh +++ b/setup/redhat/postinstall.sh @@ -9,6 +9,7 @@ ODOO_GROUP="odoo" ODOO_LOG_DIR=/var/log/odoo ODOO_LOG_FILE=$ODOO_LOG_DIR/odoo-server.log ODOO_USER="odoo" +ABI=$(rpm -q --provides python3 | awk '/abi/ {print $NF}') if ! getent passwd | grep -q "^odoo:"; then groupadd $ODOO_GROUP @@ -28,7 +29,7 @@ db_host = False db_port = False db_user = $ODOO_USER db_password = False -addons_path = /usr/lib/python3.7/site-packages/odoo/addons +addons_path = /usr/lib/python${ABI}/site-packages/odoo/addons " > $ODOO_CONFIGURATION_FILE chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE chmod 0640 $ODOO_CONFIGURATION_FILE |