diff --git a/generate_package.sh b/generate_package.sh new file mode 100755 index 0000000000000000000000000000000000000000..4f3f5733cf51d3966c9b54a90e31994d61534d32 --- /dev/null +++ b/generate_package.sh @@ -0,0 +1,37 @@ +#!/bin/bash -e + +readonly REPO_NAME="syscare" +readonly REPO_URL="https://gitee.com/openeuler/$REPO_NAME" + +# Prepare +repo_version=$(grep "Version" "$REPO_NAME.spec" | head -n 1 | awk -F ' ' '{print $NF}') +repo_dir="$REPO_NAME-$repo_version" + +rm -rf "$REPO_NAME" "$repo_dir" +git clone "$REPO_URL" + +# Prepare package build requirements +pushd "$REPO_NAME" + +cargo update -p clap --precise 4.0.32 +cargo update -p clap_lex --precise 0.3.0 +cargo vendor + +mkdir -p .cargo +cat << EOF > .cargo/config.toml +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" +EOF + +popd + +# Create tarball +mv "$REPO_NAME" "$repo_dir" +tar -czvf "$repo_dir.tar.gz" --exclude-vcs "$repo_dir" + +# Clean up +rm -rf "$repo_dir" + diff --git a/get-version.sh b/get-version.sh deleted file mode 100755 index ef62d40ee8dd0c762f7ee7485c26c0f98460d285..0000000000000000000000000000000000000000 --- a/get-version.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -set -e - -REPO=$1 -VERSION=$2 - -if [ -z "${REPO}" ]; then - echo "Please assign a directory of syscare repo." - exit 1 -fi - -if [ -z "${VERSION}" ]; then - VERSION=HEAD -fi - -cd ${REPO} -REPO=$(pwd) -REPO=${REPO##*/} -cd - -cp -r ${REPO} ${REPO}-${VERSION} -cd ${REPO}-${VERSION} - -if [ "${VERSION}" != "HEAD" ]; then - git checkout v${VERSION} -else - git checkout ${VERSION} -fi - -for file in `find . -name Cargo.toml` -do - dir=${file%/Cargo.toml*} - - if [ -n "${dir}" ]; then - cd ${dir} - cargo vendor - mkdir -p .cargo - - cat > .cargo/config << EOF -[source.crates-io] -replace-with = "local-registry" - -[source.local-registry] -directory = "vendor" -EOF - - cd - - fi -done - -cd .. - -rm -rf ${REPO}-${VERSION}/.git -tar -zcf ${REPO}-${VERSION}.tar.gz ${REPO}-${VERSION} -echo "Output: ${REPO}-${VERSION}.tar.gz" - diff --git a/syscare-1.0.1.tar.gz b/syscare-1.0.2.tar.gz similarity index 75% rename from syscare-1.0.1.tar.gz rename to syscare-1.0.2.tar.gz index 0e627abe147f743c86418203b26b2d11319a3bce..6c6a84ea6102ad6dd8cec86e6c311405b927078f 100644 Binary files a/syscare-1.0.1.tar.gz and b/syscare-1.0.2.tar.gz differ diff --git a/syscare.spec b/syscare.spec index 62ee3dc3854bdb435898a34a8af20c49fac44b91..c5fe7e752e302f0bf7c0d19b574b57f02426b12e 100644 --- a/syscare.spec +++ b/syscare.spec @@ -5,8 +5,8 @@ %define kernel_name %(echo $(rpm -q --qf "\%%{VERSION}-\%%{RELEASE}.\%%{ARCH}" %{kernel_devel_rpm})) Name: syscare -Version: 1.0.1 -Release: 9 +Version: 1.0.2 +Release: 1 Summary: system hot-fix service License: MulanPSL-2.0 and GPL-2.0-only @@ -117,6 +117,9 @@ echo "/lib/modules/%{kernel_name}/extra/syscare/upatch.ko" | /sbin/weak-modules %attr(755,root,root) /usr/libexec/syscare/upatch-diff %changelog +* Fri Jun 09 2023 renoseven - 1.0.2-1 +- Fix 'rpmpbuild getcwd failed' issue +- Fix 'upatch ko prints redundant log' issue * Fri Jun 09 2023 renoseven - 1.0.1-9 - Fix 'patch file is not checked' issue - Rename patched source package