feat: rename osname and image arch

Makefile

@@ -200,10 +200,10 @@ linux64: jni-header
 	docker run $(DOCKER_RUN_OPTS) -i -v $$PWD:/work xerial/centos5-linux-x86_64-pic bash -c 'make clean-native native-nocmake OS_NAME=Linux OS_ARCH=x86_64'
 
 alpine-image:
-	docker build -f docker/Dockerfile.alpine-linux-x86_64 -t snappy-java-alpine .
+	docker build -f docker/Dockerfile.linux-x86_64-alpine -t snappy-java-alpine .
 
 alpine: jni-header
-	docker run $(DOCKER_RUN_OPTS) -i -v $$PWD:/work snappy-java-alpine bash -c 'make clean-native native-nocmake OS_NAME=Alpine OS_ARCH=x86_64'
+	docker run $(DOCKER_RUN_OPTS) -i -v $$PWD:/work snappy-java-alpine bash -c 'make clean-native native-nocmake OS_NAME=Linux OS_ARCH=x86_64-alpine'
 
 freebsd64:
 	$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64

Makefile.common

@@ -50,7 +50,7 @@ endif
 # os=Default is meant to be generic unix/linux
 
 # To support new CPU architecture, add a new target name here
-known_os_archs := Alpine-x86_64 Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64 Linux-loongarch Linux-loongarch64
+known_os_archs := Linux-x86_64-alpine Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 Windows-aarch64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64 Linux-loongarch Linux-loongarch64
 os_arch := $(OS_NAME)-$(OS_ARCH)
 IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7"))
 
@@ -102,16 +102,16 @@ Linux-x86_64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
 Linux-x86_64_LIBNAME   := libsnappyjava.so
 Linux-x86_64_SNAPPY_FLAGS  :=
 
-Alpine-x86_64_CXX       := $(CROSS_PREFIX)g++
-Alpine-x86_64_STRIP     := $(CROSS_PREFIX)strip
+Linux-x86_64-alpine_CXX       := $(CROSS_PREFIX)g++
+Linux-x86_64-alpine_STRIP     := $(CROSS_PREFIX)strip
 ifeq ($(IBM_JDK_7),)
-  Alpine-x86_64_CXXFLAGS  := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 -std=c++11
+  Linux-x86_64-alpine_CXXFLAGS  := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 -std=c++11
 else
-  Alpine-x86_64_CXXFLAGS  := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 -std=c++11
+  Linux-x86_64-alpine_CXXFLAGS  := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 -std=c++11
 endif
-Alpine-x86_64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
-Alpine-x86_64_LIBNAME   := libsnappyjava.so
-Alpine-x86_64_SNAPPY_FLAGS  :=
+Linux-x86_64-alpine_LINKFLAGS := -shared -static-libgcc -static-libstdc++
+Linux-x86_64-alpine_LIBNAME   := libsnappyjava.so
+Linux-x86_64-alpine_SNAPPY_FLAGS  :=
 
 Linux-ppc_CXX         := g++
 Linux-ppc_STRIP       := strip

build.sbt

@@ -111,7 +111,7 @@ OsgiKeys.additionalHeaders := Map(
     "org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so;osname=linux;processor=ppc64le",
     "org/xerial/snappy/native/Linux/s390x/libsnappyjava.so;osname=linux;processor=s390x",
     "org/xerial/snappy/native/Linux/loongarch64/libsnappyjava.so;osname=linux;processor=loongarch64",
-    "org/xerial/snappy/native/Alpine/x86_64/libsnappyjava.so;osname=alpine;processor=x86-64",
+    "org/xerial/snappy/native/Linux/x86_64-alpine/libsnappyjava.so;osname=Linux;processor=x86-64-alpine",
     "org/xerial/snappy/native/AIX/ppc/libsnappyjava.a;osname=aix;processor=ppc",
     "org/xerial/snappy/native/AIX/ppc64/libsnappyjava.a;osname=aix;processor=ppc64",
     "org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;osname=sunos;processor=x86",