From e9532d63ab48c14e5e4db0423f5be812002cf3d7 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Fri, 14 Sep 2018 18:18:51 -0300 Subject: [PATCH] Fix arch-specific packaging and naming issues Commit 388e6a754b95f61ed1a9af9eb8900e963818c550 fixed issues #174 and #175 for AT 11.0. However, due to link being replaced in commit 70921b10a4a7fb6a5b63af5f17f3d6cfa181b3be these changes did not affect AT next at the time. This patch fixes these issue by replacing the files with symbolic links to the AT 11.0 ones. Signed-off-by: Tulio Magno Quites Machado Filho --- .../monolithic_cross/cross-common.postinst | 33 +------------------ .../deb/monolithic_cross/cross-common.prerm | 29 +--------------- configs/12.0/deb/monolithic_cross/postinst | 25 +------------- configs/12.0/deb/monolithic_cross/prerm | 26 +-------------- 4 files changed, 4 insertions(+), 109 deletions(-) mode change 100644 => 120000 configs/12.0/deb/monolithic_cross/cross-common.postinst mode change 100644 => 120000 configs/12.0/deb/monolithic_cross/cross-common.prerm mode change 100644 => 120000 configs/12.0/deb/monolithic_cross/postinst mode change 100644 => 120000 configs/12.0/deb/monolithic_cross/prerm diff --git a/configs/12.0/deb/monolithic_cross/cross-common.postinst b/configs/12.0/deb/monolithic_cross/cross-common.postinst deleted file mode 100644 index bd73a1bb8..000000000 --- a/configs/12.0/deb/monolithic_cross/cross-common.postinst +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 IBM Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -if [[ "${1}" == configure ]]; then - # Update non-standard info directories. - for INFO in $(ls __AT_DEST__/share/info/*.info.gz); do - ginstall-info ${INFO} \ - __AT_DEST__/share/info/dir > /dev/null 2>&1 || : - done - - # Make the environment modules available to users. - if [[ ! -d /usr/share/modules/modulefiles ]]; then - mkdir -p /usr/share/modules/modulefiles - fi - if [[ -w /usr/share/modules/modulefiles/. ]]; then - ln -s __AT_DEST__/share/modules/modulefiles/__AT_VER_REV_INTERNAL__* /usr/share/modules/modulefiles/. - fi -fi diff --git a/configs/12.0/deb/monolithic_cross/cross-common.postinst b/configs/12.0/deb/monolithic_cross/cross-common.postinst new file mode 120000 index 000000000..c4e563845 --- /dev/null +++ b/configs/12.0/deb/monolithic_cross/cross-common.postinst @@ -0,0 +1 @@ +../../../11.0/deb/monolithic_cross/cross-common.postinst \ No newline at end of file diff --git a/configs/12.0/deb/monolithic_cross/cross-common.prerm b/configs/12.0/deb/monolithic_cross/cross-common.prerm deleted file mode 100644 index c0b030462..000000000 --- a/configs/12.0/deb/monolithic_cross/cross-common.prerm +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 IBM Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -if [[ "${1}" == remove ]]; then - # Remove global link to the environment modules. - rm -f /usr/share/modules/modulefiles/__AT_VER_REV_INTERNAL__* - - # Update our non standard info dirs - for INFO in $(ls __AT_DEST__/share/info/*.info.gz); do - ginstall-info --delete ${INFO} \ - __AT_DEST__/share/info/dir > /dev/null 2>&1 || : - done - rm -f __AT_DEST__/share/info/dir -fi diff --git a/configs/12.0/deb/monolithic_cross/cross-common.prerm b/configs/12.0/deb/monolithic_cross/cross-common.prerm new file mode 120000 index 000000000..7628f8a1a --- /dev/null +++ b/configs/12.0/deb/monolithic_cross/cross-common.prerm @@ -0,0 +1 @@ +../../../11.0/deb/monolithic_cross/cross-common.prerm \ No newline at end of file diff --git a/configs/12.0/deb/monolithic_cross/postinst b/configs/12.0/deb/monolithic_cross/postinst deleted file mode 100644 index e949a9642..000000000 --- a/configs/12.0/deb/monolithic_cross/postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 IBM Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -if [[ "${1}" == configure ]]; then - # Update non-standard info directories. - for INFO in $(ls __DEST_CROSS__/usr/share/info/*.info.gz); do - ginstall-info ${INFO} \ - __DEST_CROSS__/usr/share/info/dir > /dev/null 2>&1 || : - done -fi diff --git a/configs/12.0/deb/monolithic_cross/postinst b/configs/12.0/deb/monolithic_cross/postinst new file mode 120000 index 000000000..6b6127a5d --- /dev/null +++ b/configs/12.0/deb/monolithic_cross/postinst @@ -0,0 +1 @@ +../../../11.0/deb/monolithic_cross/postinst \ No newline at end of file diff --git a/configs/12.0/deb/monolithic_cross/prerm b/configs/12.0/deb/monolithic_cross/prerm deleted file mode 100644 index 53a66d8c7..000000000 --- a/configs/12.0/deb/monolithic_cross/prerm +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 IBM Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -if [[ "${1}" == remove ]]; then - # Update non-standard info directories. - for INFO in $(ls __DEST_CROSS__/usr/share/info/*.info.gz); do - ginstall-info --delete ${INFO} \ - __DEST_CROSS__/usr/share/info/dir > /dev/null 2>&1 || : - done - rm -f __DEST_CROSS__/usr/share/info/dir -fi diff --git a/configs/12.0/deb/monolithic_cross/prerm b/configs/12.0/deb/monolithic_cross/prerm new file mode 120000 index 000000000..d2a6678cd --- /dev/null +++ b/configs/12.0/deb/monolithic_cross/prerm @@ -0,0 +1 @@ +../../../11.0/deb/monolithic_cross/prerm \ No newline at end of file