diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 50a4da774758d41fa83fc5b9413160216b2f401c..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# percona-xtrabackup - -#### Description -Percona XtraBackup is an open-source hot backup utility for MySQL-based servers that doesn't lock the database during the backup. - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index e61a37daf7013b284d9a27df335357ef6b61d22c..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# percona-xtrabackup - -#### 介绍 -Percona XtraBackup is an open-source hot backup utility for MySQL-based servers that doesn't lock the database during the backup. - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/adopt-mvn-mirror-and-py3.patch b/adopt-mvn-mirror-and-py3.patch new file mode 100644 index 0000000000000000000000000000000000000000..40c3ae693ee78c52609c0c90b437838d22ac3c0c --- /dev/null +++ b/adopt-mvn-mirror-and-py3.patch @@ -0,0 +1,71 @@ +diff -uprN incubator-livy-0.7.0-incubating/pom.xml incubator-livy-0.7.0-incubating_changed/pom.xml +--- incubator-livy-0.7.0-incubating/pom.xml 2020-01-07 12:32:39.000000000 +0000 ++++ incubator-livy-0.7.0-incubating_changed/pom.xml 2021-12-09 11:46:18.909447023 +0000 +@@ -171,18 +171,7 @@ + central + + Maven Repository +- https://repo1.maven.org/maven2 +- +- true +- +- +- false +- +- +- +- apache-repo +- Apache Repository +- https://repository.apache.org/content/repositories/releases ++ https://mirrors.huaweicloud.com/repository/maven/ + + true + +@@ -200,7 +189,6 @@ + core + core/scala-2.11 + coverage +- examples + python-api + repl + repl/scala-2.11 +@@ -210,7 +198,6 @@ + scala-api/scala-2.11 + server + test-lib +- integration-test + + + +diff -uprN incubator-livy-0.7.0-incubating/python-api/pom.xml incubator-livy-0.7.0-incubating_changed/python-api/pom.xml +--- incubator-livy-0.7.0-incubating/python-api/pom.xml 2020-01-07 12:32:39.000000000 +0000 ++++ incubator-livy-0.7.0-incubating_changed/python-api/pom.xml 2021-12-09 11:46:42.409690382 +0000 +@@ -46,7 +46,7 @@ + exec + + +- python ++ python3 + + setup.py + sdist +@@ -79,7 +79,7 @@ + + + flake8 +- ${skip} ++ True + + --exclude=target,resources,.eggs + --ignore=E127,E128 +diff -uprN incubator-livy-0.7.0-incubating/python-api/setup.py incubator-livy-0.7.0-incubating_changed/python-api/setup.py +--- incubator-livy-0.7.0-incubating/python-api/setup.py 2020-01-07 12:32:39.000000000 +0000 ++++ incubator-livy-0.7.0-incubating_changed/python-api/setup.py 2021-12-09 11:47:00.593878689 +0000 +@@ -53,6 +53,6 @@ setup( + keywords='livy pyspark development', + classifiers=CLASSIFIERS, + install_requires=requirements, +- setup_requires=['pytest-runner', 'flake8'], ++ setup_requires=[], + tests_require=['pytest'] + ) diff --git a/apache-incubator-disclaimer-resource-bundle-1.2-SNAPSHOT.jar b/apache-incubator-disclaimer-resource-bundle-1.2-SNAPSHOT.jar new file mode 100644 index 0000000000000000000000000000000000000000..93e265295c89aab7ca2de54bcedd3e5a5e3bb920 Binary files /dev/null and b/apache-incubator-disclaimer-resource-bundle-1.2-SNAPSHOT.jar differ diff --git a/compilec-fix.patch b/compilec-fix.patch deleted file mode 100644 index 6337019d7274e6803d68a5c442fd8a1e4f3d032c..0000000000000000000000000000000000000000 --- a/compilec-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruNa percona-xtrabackup-percona-xtrabackup-2.3.6/cmake/build_configurations/compiler_options.cmake percona-xtrabackup-percona-xtrabackup-2.3.6_patched/cmake/build_configurations/compiler_options.cmake ---- percona-xtrabackup-percona-xtrabackup-2.3.6/cmake/build_configurations/compiler_options.cmake 2016-11-25 17:05:53.000000000 +0800 -+++ percona-xtrabackup-percona-xtrabackup-2.3.6_patched/cmake/build_configurations/compiler_options.cmake 2021-07-16 21:10:47.260642064 +0800 -@@ -25,7 +25,7 @@ - - # Default GCC flags - IF(CMAKE_COMPILER_IS_GNUCC) -- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -Wno-implicit-fallthrough -Wno-stringop-truncation -Wno-stringop-overflow") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") diff --git a/gcc-10-cflags-fix.patch b/gcc-10-cflags-fix.patch deleted file mode 100644 index 641390d68cc196cd2f066322b55d30a9943855d3..0000000000000000000000000000000000000000 --- a/gcc-10-cflags-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruNa percona-xtrabackup-percona-xtrabackup-2.3.6/cmake/build_configurations/compiler_options.cmake percona-xtrabackup-percona-xtrabackup-2.3.6_patched/cmake/build_configurations/compiler_options.cmake ---- percona-xtrabackup-percona-xtrabackup-2.3.6/cmake/build_configurations/compiler_options.cmake 2021-08-02 10:04:35.684407534 +0800 -+++ percona-xtrabackup-percona-xtrabackup-2.3.6_patched/cmake/build_configurations/compiler_options.cmake 2021-08-02 10:05:25.068932898 +0800 -@@ -25,7 +25,7 @@ - - # Default GCC flags - IF(CMAKE_COMPILER_IS_GNUCC) -- SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -Wno-implicit-fallthrough -Wno-stringop-truncation -Wno-stringop-overflow") -+ SET(COMMON_C_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -Wno-implicit-fallthrough -Wno-stringop-truncation -Wno-stringop-overflow -fcommon") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - SET(COMMON_C_FLAGS "-fno-inline ${COMMON_C_FLAGS}") diff --git a/gcc-7-flags-fix.patch b/gcc-7-flags-fix.patch deleted file mode 100644 index 4fe57da0678715bcad6013b883eda975ef1f8abd..0000000000000000000000000000000000000000 --- a/gcc-7-flags-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/build_configurations/compiler_options.cmake 2021-07-16 04:05:53.000000000 -0500 -+++ b/cmake/build_configurations/compiler_options.cmake 2021-07-16 12:20:04.708833670 -0500 -@@ -34,7 +34,7 @@ - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}") - ENDIF() - IF(CMAKE_COMPILER_IS_GNUCXX) -- SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing") -+ SET(COMMON_CXX_FLAGS "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive") - # Disable inline optimizations for valgrind testing to avoid false positives - IF(WITH_VALGRIND) - SET(COMMON_CXX_FLAGS "-fno-inline ${COMMON_CXX_FLAGS}") diff --git a/livy.spec b/livy.spec new file mode 100644 index 0000000000000000000000000000000000000000..b2a35033745c51200580c8f39f49052186d91939 --- /dev/null +++ b/livy.spec @@ -0,0 +1,40 @@ +%global debug_package %{nil} + +Summary: A REST Service for Apache Spark +Name: livy +Version: 0.7.0 +Release: 1 +License: Apache License v2.0 +URL: https://livy.incubator.apache.org/ +Source0: https://github.com/apache/incubator-livy/archive/refs/tags/v%{version}-incubating.tar.gz +Source1: apache-incubator-disclaimer-resource-bundle-1.2-SNAPSHOT.jar +Patch0: adopt-mvn-mirror-and-py3.patch + + +BuildRequires: maven java-1.8.0-openjdk java-1.8.0-openjdk-devel +#BuildRequires: python3-devel python3-setuptools python3-pip python3-wheel python3-pytest-runner +BuildRequires: python3-devel python3-setuptools python3-pip python3-wheel +Requires: java-1.8.0-openjdk +BuildArch: x86_64 aarch64 + +%description +Apache Livy is an open source REST interface for interacting with Apache Spark from anywhere. +It supports executing snippets of code or programs in a Spark context that runs locally or in Apache Hadoop YARN. + +%prep +mvn install:install-file -DgroupId=org.apache.apache.resources -DartifactId=apache-incubator-disclaimer-resource-bundle -Dversion=1.2-SNAPSHOT -Dpackaging=jar -Dfile=%{SOURCE1} +%autosetup -p1 -n incubator-%{name}-%{version}-incubating + +%build +mvn clean package -DskipTests=True -Dmaven.javadoc.skip=True -T 2C + +%install +mkdir -p %{buildroot}/opt/%{name}-%{version} +cp -rf ../incubator-%{name}-%{version}-incubating %{buildroot}/opt/%{name}-%{version} + +%files +/opt/%{name}-%{version} + +%changelog +* Fri Dec 3 2021 bzhaoop - 0.7.0-1 +- Init package diff --git a/livy.yaml b/livy.yaml new file mode 100644 index 0000000000000000000000000000000000000000..e78c18bc34325bc152525a5c32aac8440e46e203 --- /dev/null +++ b/livy.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: apache/incubator-livy +tag_prefix: "^v\d\.\d\.\d-incubating" +separator: "." diff --git a/percona-xtrabackup-2.3.6.tar.gz b/percona-xtrabackup-2.3.6.tar.gz deleted file mode 100644 index ae4809c7888d7604f77fe8b0f06772193ad76092..0000000000000000000000000000000000000000 Binary files a/percona-xtrabackup-2.3.6.tar.gz and /dev/null differ diff --git a/percona-xtrabackup.spec b/percona-xtrabackup.spec deleted file mode 100644 index cc34c815b4d9dd2c5aed92f1cb646a4ca26e66f7..0000000000000000000000000000000000000000 --- a/percona-xtrabackup.spec +++ /dev/null @@ -1,105 +0,0 @@ -Name: percona-xtrabackup -Summary: Online backup for InnoDB/XtraDB in MySQL, Percona Server and MariaDB -Version: 2.3.6 -Release: 2 -License: GPLv2 -URL: http://www.percona.com/software/percona-xtrabackup/ -Source: percona-xtrabackup-%{version}.tar.gz -Patch1: gcc-7-flags-fix.patch -Patch2: compilec-fix.patch -Patch3: gcc-10-cflags-fix.patch - -Provides: %{name} - -BuildRequires: automake -BuildRequires: cmake >= 2.6.3 -BuildRequires: patch -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: libtool - -BuildRequires: perl-generators -BuildRequires: procps -BuildRequires: python-sphinx - -BuildRequires: vim-common -BuildRequires: bison -BuildRequires: ncurses-devel -BuildRequires: openssl-devel -BuildRequires: libaio-devel -BuildRequires: libgcrypt-devel -BuildRequires: libcurl-devel -BuildRequires: libev-devel -Requires: perl(DBD::mysql) -Requires: libcurl -Requires: libev - -%description -Online backup for InnoDB/XtraDB in MySQL, MariaDB and Percona Server. - -%package test -Summary: Test suite for Percona Xtrabackup -Provides: %{name}-test -Requires: %{name} -Requires: /usr/bin/mysql -Requires: %{name} = %{version}-%{release} - -%description test -This package contains the test suite for Percona Xtrabackup - -%prep -%setup -qn %{name}-%{name}-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - - -%build -cmake -DBUILD_CONFIG=xtrabackup_release && make %{?_smp_mflags} - -%install -[ "%{buildroot}" != '/' ] && rm -rf %{buildroot} -install -d %{buildroot}%{_bindir} -install -d %{buildroot}%{_datadir} -install -d %{buildroot}%{_mandir}/man1 -# install binaries and configs - -SRC_DIR=storage/innobase/xtrabackup/src -pushd . -cd $SRC_DIR -install -p -m 755 xtrabackup %{buildroot}%{_bindir} -ln -sf xtrabackup %{buildroot}%{_bindir}/innobackupex -install -p -m 755 xbstream %{buildroot}%{_bindir} -install -p -m 755 xbcrypt %{buildroot}%{_bindir} -cd .. -find test -size 0 -delete -cp -pR test %{buildroot}%{_datadir}/percona-xtrabackup-test -rm -rf %{buildroot}%{_datadir}/percona-xtrabackup-test/kewpie -rm -rf %{buildroot}%{_datadir}/percona-xtrabackup-test/*Make* -cd doc/source/build/man -install -m 644 *.1 %{buildroot}%{_mandir}/man1 - -popd - -%files -%{_bindir}/innobackupex -%{_bindir}/xtrabackup -%{_bindir}/xbstream -%{_bindir}/xbcrypt -%doc COPYING README VERSION -%{_mandir}/man1/innobackupex.1.gz -%{_mandir}/man1/xtrabackup.1.gz -%{_mandir}/man1/xbstream.1.gz -%{_mandir}/man1/xbcrypt.1.gz - -%files -n percona-xtrabackup-test -%{_datadir}/percona-xtrabackup-test -%doc COPYING - -%changelog -* Mon Aug 2 2021 bzhaoop - 2.3.6-2 -- Fix gcc 10 compiling issue - -* Mon Jul 26 2021 bzhaoop - 2.3.6-1 -- Init project for percona-xtrabackup - diff --git a/percona-xtrabackup.yaml b/percona-xtrabackup.yaml deleted file mode 100644 index 6e915854ce71cd02caa29143bd30417e3ea1ffe9..0000000000000000000000000000000000000000 --- a/percona-xtrabackup.yaml +++ /dev/null @@ -1,4 +0,0 @@ -version_control: git -src_repo: https://github.com/percona/percona-xtrabackup -tag_prefix: "" -separator: "." diff --git a/v0.7.0-incubating.tar.gz b/v0.7.0-incubating.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..58dc3265d38374d4fe626713d78017e3d3a68dc9 Binary files /dev/null and b/v0.7.0-incubating.tar.gz differ