Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions .github/workflows/build_helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1268,51 +1268,6 @@ if [ "${CI_DO_PUBLISH}" -eq 1 ]; then
exit 1
fi
fi

# [NOTE]
# Currently, the package_cloud tool must restrict gem packages depending on
# the Ruby version.
#
RB_MAJOR_VER=$(ruby -v | awk '{print $2}' | awk -F'[^0-9]' '{print $1}')
RB_MINOR_VER=$(ruby -v | awk '{print $2}' | awk -F'[^0-9]' '{print $2}')
RB_PATCH_VER=$(ruby -v | awk '{print $2}' | awk -F'[^0-9]' '{print $3}')
RB_ALL_VER=$((RB_MAJOR_VER*10000 + RB_MINOR_VER*100 + RB_PATCH_VER))

if [ "${RB_ALL_VER}" -ge 30400 ]; then
# [NOTE]
# For Ruby 3.4.0 and later, you must manually install the addrev gem package.
#
PRNINFO "Start to install addrev gem because ruby version is 3.4.0 later"
if ({ RUNCMD "${GEM_BIN}" "${GEM_INSTALL_CMD}" abbrev || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
PRNERR "Failed to install addrev gem"
exit 1
fi

# [NOTE]
# A fix for JSON::Fragment has been made in json 2.10.0 and later, which
# causes an error when running the current package_cloud tool.
# To avoid this, we will limit it to json 2.9.1.(This will occur in Fedora 42)
#
GEMJSON_MAJOR_VER=$("${GEM_BIN}" list | grep '^json[[:space:]]*(' | grep -oP '\(\K[^\)]*' | awk -F'[^0-9]' '{print $1}')
GEMJSON_MINOR_VER=$("${GEM_BIN}" list | grep '^json[[:space:]]*(' | grep -oP '\(\K[^\)]*' | awk -F'[^0-9]' '{print $2}')
GEMJSON_PATCH_VER=$("${GEM_BIN}" list | grep '^json[[:space:]]*(' | grep -oP '\(\K[^\)]*' | awk -F'[^0-9]' '{print $3}')
GEMJSON_ALL_VER=$((GEMJSON_MAJOR_VER*10000 + GEMJSON_MINOR_VER*100 + GEMJSON_PATCH_VER))

if [ "${GEMJSON_ALL_VER}" -gt 20901 ]; then
PRNINFO "Start to uninstall all json gem"
for json_installed_path in $("${GEM_BIN}" env gempath | tr ':' '\n'); do
if ({ RUNCMD "${GEM_BIN}" uninstall -i "${json_installed_path}" json -aIx || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
PRNERR "Failed to uninstall json gem in ${json_installed_path}, but continue..."
fi
done

PRNINFO "Start to install json gem 2.9.1"
if ({ RUNCMD "${GEM_BIN}" "${GEM_INSTALL_CMD}" json -v 2.9.1 || echo > "${PIPEFAILURE_FILE}"; } | sed -e 's/^/ /g') && rm "${PIPEFAILURE_FILE}" >/dev/null 2>&1; then
PRNERR "Failed to install json gem"
exit 1
fi
fi
fi
else
PRNINFO "Skip to install published tools for uploading packages to packagecloud.io, because this CI process does not upload any packages."
fi
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,14 @@ jobs:
- ubuntu:22.04
- debian:trixie
- debian:bookworm
- debian:bullseye
- rockylinux/rockylinux:10
- rockylinux:9
- rockylinux:8
- fedora:45
- fedora:44
- fedora:43
- alpine:3.24
- alpine:3.23
- alpine:3.22
- alpine:3.21

container:
image: ${{ matrix.container }}
Expand Down
36 changes: 4 additions & 32 deletions .github/workflows/ostypevars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -164,20 +164,6 @@ elif echo "${CI_OSTYPE}" | grep -q -i -e "debian:12" -e "debian:bookworm"; then
PKG_EXT="deb"
IS_OS_DEBIAN=1

elif echo "${CI_OSTYPE}" | grep -q -i -e "debian:11" -e "debian:bullseye"; then
DIST_TAG="debian/bullseye"
INSTALL_PKG_LIST="git autoconf autotools-dev gcc g++ make gdb dh-make fakeroot dpkg-dev devscripts libtool pkg-config ruby-dev rubygems rubygems-integration procps libyaml-dev chmpx-dev gnutls-dev"
INSTALLER_BIN="apt-get"
UPDATE_CMD="update"
UPDATE_CMD_ARG=""
INSTALL_CMD="install"
INSTALL_CMD_ARG=""
INSTALL_AUTO_ARG="-y"
INSTALL_QUIET_ARG="-qq"
PKG_OUTPUT_DIR="debian_build"
PKG_EXT="deb"
IS_OS_DEBIAN=1

elif echo "${CI_OSTYPE}" | grep -q -i "rockylinux:10"; then
DIST_TAG="el/10"
INSTALL_PKG_LIST="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems procps libyaml-devel chmpx-devel openssl-devel systemd"
Expand Down Expand Up @@ -253,8 +239,8 @@ elif echo "${CI_OSTYPE}" | grep -q -i "rockylinux:8"; then
echo "[ERROR] Failed to install \"dnf-command(config-manager)\". The script doesn't break here, but fails to install the package."
fi

elif echo "${CI_OSTYPE}" | grep -q -i "fedora:44"; then
DIST_TAG="fedora/44"
elif echo "${CI_OSTYPE}" | grep -q -i "fedora:45"; then
DIST_TAG="fedora/45"
INSTALL_PKG_LIST="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems procps libyaml-devel chmpx-devel openssl-devel systemd"
INSTALLER_BIN="dnf"
UPDATE_CMD="update"
Expand All @@ -267,8 +253,8 @@ elif echo "${CI_OSTYPE}" | grep -q -i "fedora:44"; then
PKG_EXT="rpm"
IS_OS_FEDORA=1

elif echo "${CI_OSTYPE}" | grep -q -i "fedora:43"; then
DIST_TAG="fedora/43"
elif echo "${CI_OSTYPE}" | grep -q -i "fedora:44"; then
DIST_TAG="fedora/44"
INSTALL_PKG_LIST="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems procps libyaml-devel chmpx-devel openssl-devel systemd"
INSTALLER_BIN="dnf"
UPDATE_CMD="update"
Expand Down Expand Up @@ -322,20 +308,6 @@ elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.22"; then
PKG_OUTPUT_DIR="apk_build"
PKG_EXT="apk"
IS_OS_ALPINE=1

elif echo "${CI_OSTYPE}" | grep -q -i "alpine:3.21"; then
DIST_TAG="alpine/v3.21"
INSTALL_PKG_LIST="bash sudo alpine-sdk automake autoconf libtool groff util-linux-misc musl-locales ruby-dev procps yaml-dev chmpx-dev openssl-dev"
INSTALLER_BIN="apk"
UPDATE_CMD="update"
UPDATE_CMD_ARG="--no-progress"
INSTALL_CMD="add"
INSTALL_CMD_ARG="--no-progress --no-cache"
INSTALL_AUTO_ARG=""
INSTALL_QUIET_ARG="-q"
PKG_OUTPUT_DIR="apk_build"
PKG_EXT="apk"
IS_OS_ALPINE=1
fi

#---------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ SHELLCHECK_CMD = shellcheck
SHELLCHECK_BASE_OPT = --shell=sh
SHELLCHECK_IGN_OPT = --exclude=SC1117,SC1090,SC1091
SHELLCHECK_INCLUDE_IGN_OPT = --exclude=SC1117,SC1090,SC1091,SC2034,SC2148
SHELLCHECK_FILES_NO_SH = `grep -ril '^\#!/bin/sh' . | grep -v '\.sh' | grep -v '\.log' | grep -v '/\.git/' | grep -v '/rpmbuild/' | grep -v '/debian_build/' | grep -v '/autom4te.cache/' | grep -v '/m4/' | grep -v '/install-sh' | grep -v '/ltmain.sh' | tr '\n' ' '`
SHELLCHECK_FILES_SH = `grep -ril '^\#!/bin/sh' . | grep '\.sh' | grep -v '\.log' | grep -v '/\.git/' | grep -v '/rpmbuild/' | grep -v '/debian_build/' | grep -v '/autom4te.cache/' | grep -v '/m4/' | grep -v '/install-sh' | grep -v '/ltmain.sh' | tr '\n' ' '`
SHELLCHECK_FILES_INCLUDE_SH = `grep -Lir '^\#!/bin/sh' . | grep '\.sh' | grep -v '\.log' | grep -v '/\.git/' | grep -v '/rpmbuild/' | grep -v '/debian_build/' | grep -v '/autom4te.cache/' | grep -v '/m4/' | grep -v '/install-sh' | grep -v '/ltmain.sh' | tr '\n' ' '`
SHELLCHECK_FILES_NO_SH = `grep -ril "^$$(printf '%b' '\0043')!/bin/sh" . | grep -v '\.sh' | grep -v '\.log' | grep -v '/\.git/' | grep -v '/rpmbuild/' | grep -v '/debian_build/' | grep -v '/autom4te.cache/' | grep -v '/m4/' | grep -v '/install-sh' | grep -v '/ltmain.sh' | tr '\n' ' '`
SHELLCHECK_FILES_SH = `grep -ril "^$$(printf '%b' '\0043')!/bin/sh" . | grep '\.sh' | grep -v '\.log' | grep -v '/\.git/' | grep -v '/rpmbuild/' | grep -v '/debian_build/' | grep -v '/autom4te.cache/' | grep -v '/m4/' | grep -v '/install-sh' | grep -v '/ltmain.sh' | tr '\n' ' '`
SHELLCHECK_FILES_INCLUDE_SH = `grep -Lir "^$$(printf '%b' '\0043')!/bin/sh" . | grep '\.sh' | grep -v '\.log' | grep -v '/\.git/' | grep -v '/rpmbuild/' | grep -v '/debian_build/' | grep -v '/autom4te.cache/' | grep -v '/m4/' | grep -v '/install-sh' | grep -v '/ltmain.sh' | tr '\n' ' '`

shellcheck:
@set -e; \
Expand Down
4 changes: 3 additions & 1 deletion buildutils/k2hdkc.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
%global run_autogen echo "skip autogen.sh"
%endif

%global major_version %{lua: print(string.match("@VERSION@", "^%d+"))}

#
# main package
#
Expand Down Expand Up @@ -93,7 +95,7 @@ install -D -m 644 buildutils/override.conf.k2hdkc_example %{buildroot}/etc/antpi
%license COPYING

%doc README AUTHORS ChangeLog
%{_libdir}/*.so.*
%{_libdir}/*.so.%{major_version}*
%{_mandir}/man1/*
%{_bindir}/*
/lib/systemd/system/k2hdkc.service
Expand Down
12 changes: 6 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ AS_IF([test "$PKG_CONFIG" = "no"], [AC_MSG_ERROR(You have to install pkg-config
#
# Version list for Libraries
#
AC_SUBST([LIB_MINVER_CHMPX], "1.0.113")
AC_SUBST([LIB_MINVER_LIBK2HASH], "1.0.103")
AC_SUBST([LIB_MINVER_LIBFULLOCK], "1.0.68")
AC_SUBST([LIB_MINVER_CHMPX], "1.0.114")
AC_SUBST([LIB_MINVER_LIBK2HASH], "1.0.104")
AC_SUBST([LIB_MINVER_LIBFULLOCK], "1.0.69")

#
# Checking Libraries
Expand All @@ -161,9 +161,9 @@ AC_ARG_ENABLE(check-depend-libs,
esac]
)
AS_IF([test ${check_depend_libs} = 1], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.68], [], [AC_MSG_ERROR(not found libfullock package)])])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([k2hash], [libk2hash >= 1.0.103], [], [AC_MSG_ERROR(not found k2hash package)])])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([chmpx], [libchmpx >= 1.0.113], [], [AC_MSG_ERROR(not found chmpx package)])])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.69], [], [AC_MSG_ERROR(not found libfullock package)])])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([k2hash], [libk2hash >= 1.0.104], [], [AC_MSG_ERROR(not found k2hash package)])])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([chmpx], [libchmpx >= 1.0.114], [], [AC_MSG_ERROR(not found chmpx package)])])

#
# CFLAGS/CXXFLAGS
Expand Down
2 changes: 1 addition & 1 deletion src/k2hdkcconfparser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ bool K2hdkcConfig::ReadContents(const char* path, strarr_t& lines, strarr_t& fil
if(key == INI_INCLUDE_STR){
// found include, do reentrant
if(!K2hdkcConfig::ReadContents(value.c_str(), lines, files)){
ERR_DKCPRN("Failed to load include file(%s)", value.c_str());
ERR_DKCPRN("Failed to load include file(%s):L%d", value.c_str(), lineno);
cfgstream.close();
return false;
}
Expand Down
Loading