!49 [sync] PR-47: update syscare to 1.0.2-1

From: @openeuler-sync-bot 
Reviewed-by: @snoweay 
Signed-off-by: @snoweay
This commit is contained in:
openeuler-ci-bot 2023-06-09 06:03:03 +00:00 committed by Gitee
commit 804f54f23b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 42 additions and 57 deletions

37
generate_package.sh Executable file
View File

@ -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"

View File

@ -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"

View File

@ -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<dev@renoseven.net> - 1.0.2-1
- Fix 'rpmpbuild getcwd failed' issue
- Fix 'upatch ko prints redundant log' issue
* Fri Jun 09 2023 renoseven<dev@renoseven.net> - 1.0.1-9
- Fix 'patch file is not checked' issue
- Rename patched source package