diff options
| -rwxr-xr-x | build-packages.sh | 10 | ||||
| -rwxr-xr-x | build-test.sh | 23 |
2 files changed, 28 insertions, 5 deletions
diff --git a/build-packages.sh b/build-packages.sh index 9b929715e9..4821386090 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -16,6 +16,10 @@ initHostDistroRid() if [ "$__HostOS" == "Linux" ]; then if [ -e /etc/os-release ]; then source /etc/os-release + if [[ $ID == "alpine" ]]; then + # remove the last version digit + VERSION_ID=${VERSION_ID%.*} + fi __HostDistroRid="$ID.$VERSION_ID-$__Arch" elif [ -e /etc/redhat-release ]; then local redhatRelease=$(</etc/redhat-release) @@ -24,9 +28,13 @@ initHostDistroRid() fi fi fi + if [ "$__HostOS" == "FreeBSD" ]; then + __freebsd_version=`sysctl -n kern.osrelease | cut -f1 -d'.'` + __HostDistroRid="freebsd.$__freebsd_version-$__Arch" + fi if [ "$__HostDistroRid" == "" ]; then - echo "WARNING: Can not determine runtime id for current distro." + echo "WARNING: Cannot determine runtime id for current distro." fi } diff --git a/build-test.sh b/build-test.sh index 48d9a1f604..e560faf3f5 100755 --- a/build-test.sh +++ b/build-test.sh @@ -2,15 +2,30 @@ initHostDistroRid() { + __HostDistroRid="" if [ "$__HostOS" == "Linux" ]; then - if [ ! -e /etc/os-release ]; then - echo "WARNING: Can not determine runtime id for current distro." - __HostDistroRid="" - else + if [ -e /etc/os-release ]; then source /etc/os-release + if [[ $ID == "alpine" ]]; then + # remove the last version digit + VERSION_ID=${VERSION_ID%.*} + fi __HostDistroRid="$ID.$VERSION_ID-$__HostArch" + elif [ -e /etc/redhat-release ]; then + local redhatRelease=$(</etc/redhat-release) + if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then + __HostDistroRid="rhel.6-$__HostArch" + fi fi fi + if [ "$__HostOS" == "FreeBSD" ]; then + __freebsd_version=`sysctl -n kern.osrelease | cut -f1 -d'.'` + __HostDistroRid="freebsd.$__freebsd_version-$__HostArch" + fi + + if [ "$__HostDistroRid" == "" ]; then + echo "WARNING: Cannot determine runtime id for current distro." + fi } initTargetDistroRid() |