Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit08b18e3

Browse files
committed
[skip travis] build repo packages for std|ent
1 parent6f4bc2b commit08b18e3

File tree

2 files changed

+22
-58
lines changed

2 files changed

+22
-58
lines changed

‎packaging/repo/scripts/alt.sh‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,38 @@ export OUT_DIR=/app/www/${PBK_PKG_REPO}
1818
apt-get update -y
1919
apt-get install -qq -y apt-repo-tools gnupg rsync perl less wget
2020

21+
if [[${PBK_EDITION}=='' ]];then
22+
REPO_SUFFIX='vanilla'
23+
FORK='PostgreSQL'
24+
else
25+
REPO_SUFFIX='forks'
26+
FORK='PostgresPro'
27+
fi
28+
2129
cd$INPUT_DIR
2230

2331
cp -arv /app/repo/$PBK_PKG_REPO/gnupg /root/.gnupg
2432
chmod -R 0600 /root/.gnupg
2533
forpkgin$(ls);do
2634
forpkg_full_versionin$(ls ./$pkg);do
27-
RPM_DIR=${OUT_DIR}/rpm/${pkg_full_version}/altlinux-p${DISTRIB_VERSION}/x86_64/RPMS.vanilla
28-
SRPM_DIR=${OUT_DIR}/srpm/${pkg_full_version}/altlinux-p${DISTRIB_VERSION}/x86_64/SRPMS.vanilla
35+
RPM_DIR=${OUT_DIR}/rpm/${pkg_full_version}/altlinux-p${DISTRIB_VERSION}/x86_64/RPMS.${REPO_SUFFIX}
36+
SRPM_DIR=${OUT_DIR}/srpm/${pkg_full_version}/altlinux-p${DISTRIB_VERSION}/x86_64/SRPMS.${REPO_SUFFIX}
2937

30-
# rm -rf "$RPM_DIR" && mkdir -p "$RPM_DIR"
31-
# rm -rf "$SRPM_DIR" && mkdir -p "$SRPM_DIR"
3238
mkdir -p"$RPM_DIR"
3339
mkdir -p"$SRPM_DIR"
3440

3541
cp -arv$INPUT_DIR/$pkg/$pkg_full_version/RPMS/x86_64/*$RPM_DIR/
3642
cp -arv$INPUT_DIR/$pkg/$pkg_full_version/SRPMS/*$SRPM_DIR/
3743

3844
genbasedir --architecture=x86_64 --architectures=x86_64 --origin=repo.postgrespro.ru \
39-
--label='PostgreSQL backup utility pg_probackup' --description'PostgreSQL pg_probackup repo' \
45+
--label="${FORK} backup utility pg_probackup" --description"${FORK} pg_probackup repo" \
4046
--version=$pkg_full_version --bloat --progress --create \
41-
--topdir=${OUT_DIR}/rpm/${pkg_full_version}/altlinux-p${DISTRIB_VERSION} x86_64vanilla
47+
--topdir=${OUT_DIR}/rpm/${pkg_full_version}/altlinux-p${DISTRIB_VERSION} x86_64${REPO_SUFFIX}
4248

4349
genbasedir --architecture=x86_64 --architectures=x86_64 --origin=repo.postgrespro.ru \
44-
--label='PostgreSQL backup utility pg_probackup sources' --description'PostgreSQL pg_probackup repo' \
50+
--label="${FORK} backup utility pg_probackup sources" --description"${FORK} pg_probackup repo" \
4551
--version=$pkg_full_version --bloat --progress --create \
46-
--topdir=${OUT_DIR}/srpm/${pkg_full_version}/altlinux-p${DISTRIB_VERSION} x86_64vanilla
52+
--topdir=${OUT_DIR}/srpm/${pkg_full_version}/altlinux-p${DISTRIB_VERSION} x86_64${REPO_SUFFIX}
4753

4854
# genbasedir --bloat --progress --create \
4955
# --topdir=${OUT_DIR}/$repo_name/rpm/${pkg_full_version}/altlinux-p${DISTRIB_VERSION} x86_64 vanilla

‎packaging/repo/scripts/rpm.sh‎

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,14 @@ chown -R root:root /root/.gnupg
3333
forpkgin$(ls${INPUT_DIR});do
3434
forpkg_full_versionin$(ls${INPUT_DIR}/$pkg);do
3535

36-
cp$INPUT_DIR/$pkg/$pkg_full_version/RPMS/noarch/pg_probackup-repo-*.noarch.rpm \
37-
$KEYS_DIR/pg_probackup-repo-$DISTRIB.noarch.rpm
36+
if [[${PBK_EDITION}=='' ]];then
37+
cp$INPUT_DIR/$pkg/$pkg_full_version/RPMS/noarch/pg_probackup-repo-*.noarch.rpm \
38+
$KEYS_DIR/pg_probackup-repo-$DISTRIB.noarch.rpm
39+
else
40+
cp$INPUT_DIR/$pkg/$pkg_full_version/RPMS/noarch/pg_probackup-repo-*.noarch.rpm \
41+
$KEYS_DIR/pg_probackup-repo-forks-$DISTRIB.noarch.rpm
42+
fi
43+
3844
[!-z"$CODENAME" ]&&export DISTRIB_VERSION=$CODENAME
3945
RPM_DIR=$OUT_DIR/rpm/$pkg_full_version/${DISTRIB}-${DISTRIB_VERSION}-x86_64
4046
SRPM_DIR=$OUT_DIR/srpm/$pkg_full_version/${DISTRIB}-${DISTRIB_VERSION}-x86_64
@@ -53,51 +59,3 @@ for pkg in $(ls ${INPUT_DIR}); do
5359
createrepo$SRPM_DIR/
5460
done
5561
done
56-
57-
#if [ $repo_name == 'pg_probackup-forks' ]
58-
#then
59-
##/app/www/pg_probackup_repo/
60-
#export KEYS_DIR=$OUT_DIR/$repo_name/keys
61-
#mkdir -p "$KEYS_DIR"
62-
#rsync /app/src/$repo_name/gnupg/key.public $KEYS_DIR/GPG-KEY-PG_PROBACKUP
63-
#chmod 755 $KEYS_DIR
64-
#chmod +x /app/src/$repo_name/autosign.sh
65-
#echo -e 'User-agent: *\nDisallow: /' > $OUT_DIR/$repo_name/robots.txt
66-
#
67-
#cp -arv /app/src/$repo_name/rpmmacros /root/.rpmmacros
68-
#cp -arv /app/src/$repo_name/gnupg /root/.gnupg
69-
#chmod -R 0600 /root/.gnupg
70-
#
71-
#cd $INPUT_DIR/$repo_name
72-
#for pkg in $(ls); do
73-
#for pkg_full_version in $(ls ./$pkg); do
74-
#
75-
#if [ $pkg == 'pg_probackup-repo-forks' ]; then
76-
#cp $INPUT_DIR/$repo_name/$pkg/$pkg_full_version/RPMS/noarch/pg_probackup-repo-*.noarch.rpm \
77-
#$KEYS_DIR/pg_probackup-repo-forks-$DISTRIB.noarch.rpm
78-
#continue
79-
# fi
80-
#
81-
#[ ! -z "$CODENAME" ] && export DISTRIB_VERSION=$CODENAME
82-
#RPM_DIR=$OUT_DIR/$repo_name/rpm/$pkg_full_version/${DISTRIB}-${DISTRIB_VERSION}-x86_64
83-
##SRPM_DIR=$OUT_DIR/$repo_name/srpm/$pkg_full_version/${DISTRIB}-${DISTRIB_VERSION}-x86_64
84-
#
85-
##rm -rf "$RPM_DIR" && mkdir -p "$RPM_DIR"
86-
##rm -rf "$SRPM_DIR" && mkdir -p "$SRPM_DIR"
87-
#mkdir -p "$RPM_DIR"
88-
##mkdir -p "$SRPM_DIR"
89-
#
90-
#cp -arv $INPUT_DIR/$repo_name/$pkg/$pkg_full_version/RPMS/x86_64/* $RPM_DIR/
91-
##cp -arv $INPUT_DIR/$repo_name/$pkg/$pkg_full_version/SRPMS/* $SRPM_DIR/
92-
#
93-
#for f in $(ls $RPM_DIR/*.rpm); do rpm --addsign $f || exit 1; done
94-
##for f in $(ls $SRPM_DIR/*.rpm); do rpm --addsign $f || exit 1; done
95-
#createrepo $RPM_DIR/
96-
##createrepo $SRPM_DIR/
97-
#done
98-
#done
99-
#
100-
## repo cleanup
101-
#rm -rf /root/.rpmmacros
102-
#rm -rf /root/.gnupg
103-
#fi

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp