File tree Expand file tree Collapse file tree 1 file changed +1
-17
lines changed Expand file tree Collapse file tree 1 file changed +1
-17
lines changed Original file line number Diff line number Diff line change @@ -20,10 +20,6 @@ getNonPortableDistroRid()
20
20
# shellcheck disable=SC1091
21
21
if [ -e " ${rootfsDir} /etc/os-release" ]; then
22
22
. " ${rootfsDir} /etc/os-release"
23
- if [ " ${ID} " = " rhel" ] || [ " ${ID} " = " rocky" ] || [ " ${ID} " = " alpine" ] || [ " ${ID} " = " ol" ]; then
24
- VERSION_ID=" ${VERSION_ID% .* } " # Remove the last version digit for these distros
25
- fi
26
-
27
23
if echo " ${VERSION_ID:- } " | grep -qE ' ^([[:digit:]]|\.)+$' ; then
28
24
nonPortableRid=" ${ID} .${VERSION_ID} -${targetArch} "
29
25
else
@@ -48,19 +44,7 @@ getNonPortableDistroRid()
48
44
nonPortableRid=" android.$__android_sdk_version -${targetArch} "
49
45
elif [ " $targetOs " = " illumos" ]; then
50
46
__uname_version=$( uname -v)
51
- case " $__uname_version " in
52
- omnios-* )
53
- __omnios_major_version=$( echo " $__uname_version " | cut -c9-10)
54
- nonPortableRid=" omnios.$__omnios_major_version -${targetArch} "
55
- ;;
56
- joyent_* )
57
- __smartos_major_version=$( echo " $__uname_version " | cut -c9-10)
58
- nonPortableRid=" smartos.$__smartos_major_version -${targetArch} "
59
- ;;
60
- * )
61
- nonPortableRid=" illumos-${targetArch} "
62
- ;;
63
- esac
47
+ nonPortableRid=" illumos-${targetArch} "
64
48
elif [ " $targetOs " = " solaris" ]; then
65
49
__uname_version=$( uname -v)
66
50
__solaris_major_version=$( echo " $__uname_version " | cut -d' .' -f1)
You can’t perform that action at this time.
0 commit comments