Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
d081d50f
Commit
d081d50f
authored
Nov 22, 2020
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add comments about correct pack src.rpm
parent
80d2c9df
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
8 deletions
+19
-8
rpmbs
bin/rpmbs
+1
-1
buildsrpm
share/eterbuild/functions/buildsrpm
+18
-7
No files found.
bin/rpmbs
View file @
d081d50f
...
@@ -94,7 +94,7 @@ while getopts :hfFstTcudenop:a:Ab:z opt; do
...
@@ -94,7 +94,7 @@ while getopts :hfFstTcudenop:a:Ab:z opt; do
n
)
NOCHECK
=
1
;
;;
n
)
NOCHECK
=
1
;
;;
o
)
NOSOURCE
=
1
;
;;
o
)
NOSOURCE
=
1
;
;;
p
)
UPLOADNOW
=
1
;
SIGN
=
1
;
POCKET
=
$OPTARG
;;
p
)
UPLOADNOW
=
1
;
SIGN
=
1
;
POCKET
=
$OPTARG
;;
w
)
THOROUGH
=
1
;;
w
)
THOROUGH
=
2
;;
z
)
export
USE_LEGACY_COMPRESSION
=
1
;
z
)
export
USE_LEGACY_COMPRESSION
=
1
;
;;
;;
d
)
DELETENOW
=
1
;;
d
)
DELETENOW
=
1
;;
...
...
share/eterbuild/functions/buildsrpm
View file @
d081d50f
...
@@ -36,7 +36,7 @@ uni_rpmbuildsrpm()
...
@@ -36,7 +36,7 @@ uni_rpmbuildsrpm()
cd
$SPECDIR
||
fatal
cd
$SPECDIR
||
fatal
if
is_gear
$SPECDIR
;
then
if
[
"
$PKGVENDOR
"
=
"alt"
]
&&
is_gear
$SPECDIR
;
then
[
-f
"
$SPECNAME
"
]
||
fatal
"run uni_rpmbuild with spec as 2nd parameter"
[
-f
"
$SPECNAME
"
]
||
fatal
"run uni_rpmbuild with spec as 2nd parameter"
shift
# skip spec name
shift
# skip spec name
...
@@ -47,10 +47,15 @@ uni_rpmbuildsrpm()
...
@@ -47,10 +47,15 @@ uni_rpmbuildsrpm()
# https://bugzilla.altlinux.org/show_bug.cgi?id=31673
# https://bugzilla.altlinux.org/show_bug.cgi?id=31673
# FIXME: workaround for case when gear not supported normal name for --hasher output (out_file can be set only when run without args)
# FIXME: workaround for case when gear not supported normal name for --hasher output (out_file can be set only when run without args)
mkdir
-p
$RPMTOPDIR
/SRPMS
mkdir
-p
$RPMTOPDIR
/SRPMS
NAMESRPMIN
=
${
NAMESRPMIN
/.src.rpm/.tar
}
if
false
&&
[
"
$THOROUGH
"
=
"2"
]
;
then
echog
"Packing git repo with
\$
SPECNAME as
\$
NAMESRPMIN"
# TODO: use hsh --build-srpm-only to produce src.rpm when call from rpmbs -w
LANG
=
$NEULOCALE
docmd
$NICE
$GEAR
$COMMIT
$GEARRULES
$RPMTOPDIR
/SRPMS/
$NAMESRPMIN
echog
"Packing git repo with
\$
SPECNAME as
\$
NAMESRPMIN"
# TODO: use hsh --build-srpm-only to produce src.rpm when call from rpmbs -w
#docmd $NICE $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" "$@" || RET=$?
else
NAMESRPMIN
=
${
NAMESRPMIN
/.src.rpm/.tar
}
echog
"Packing git repo with
\$
SPECNAME as
\$
NAMESRPMIN"
LANG
=
$NEULOCALE
docmd
$NICE
$GEAR
$COMMIT
$GEARRULES
$RPMTOPDIR
/SRPMS/
$NAMESRPMIN
fi
else
else
# build package without MENV checking
# build package without MENV checking
#if true || [ "$MENV" = "SS" ] ; then
#if true || [ "$MENV" = "SS" ] ; then
...
@@ -65,8 +70,14 @@ uni_rpmbuildsrpm()
...
@@ -65,8 +70,14 @@ uni_rpmbuildsrpm()
fi
fi
else
else
mkdir
-p
$RPMTOPDIR
/BUILD
$RPMTOPDIR
/SRPMS
mkdir
-p
$RPMTOPDIR
/BUILD
$RPMTOPDIR
/SRPMS
echog
"Packing
\$
SPECNAME as
\$
NAMESRPMIN"
if
false
&&
[
"
$PKGVENDOR
"
=
"alt"
]
&&
[
-n
"
$THOROUGH
"
]
;
then
docmd
$NICE
$RPMBUILD
"
$ONEPARAM
"
"
$TWOPARAM
"
"
$THRPARAM
"
"
$@
"
||
RET
=
$?
echog
"Packing
\$
SPECNAME as
\$
NAMESRPMIN via hasher"
# TODO: use hsh --build-srpm-only to produce src.rpm when call from rpmbs -w
#docmd $NICE $RPMBUILD "$ONEPARAM" "$TWOPARAM" "$THRPARAM" "$@" || RET=$?
else
echog
"Packing
\$
SPECNAME as
\$
NAMESRPMIN"
docmd
$NICE
$RPMBUILD
"
$ONEPARAM
"
"
$TWOPARAM
"
"
$THRPARAM
"
"
$@
"
||
RET
=
$?
fi
fi
fi
cd
-
>
/dev/null
cd
-
>
/dev/null
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment