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
f2abddd3
Commit
f2abddd3
authored
Jan 06, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drop out is_git function, use is_gear instead
parent
489e4329
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
17 deletions
+7
-17
rpmbb
bin/rpmbb
+1
-1
rpmcs
bin/rpmcs
+1
-1
common
share/eterbuild/functions/common
+0
-12
rpm
share/eterbuild/functions/rpm
+5
-3
No files found.
bin/rpmbb
View file @
f2abddd3
...
...
@@ -97,7 +97,7 @@ for i in $LISTNAMES
do
# build src.rpm if old way
SPECDIR
=
`
dirname
$i
`
is_g
it
$SPECDIR
||
build_rpms_name
"
$i
"
is_g
ear
$SPECDIR
||
build_rpms_name
"
$i
"
if
!
is_alt
;
then
if
!
build_buildroot
;
then
LISTRPMARGS
=
"--buildroot
$BUILDROOT
$LISTRPMARGS
"
...
...
bin/rpmcs
View file @
f2abddd3
...
...
@@ -119,7 +119,7 @@ do
subst
"s|Patch0:|Patch:|"
$i
SPECDIR
=
`
dirname
$i
`
if
!
is_g
it
$SPECDIR
&&
[
-n
"
$RENAME_SOURCE_TARBALL
"
]
;
then
if
!
is_g
ear
$SPECDIR
&&
[
-n
"
$RENAME_SOURCE_TARBALL
"
]
;
then
# Use tar.bz2 for tarball if not git case.
subst
"s|
\(
Source:.*
\)
.tar.gz|
\1
.tar.bz2|"
$i
subst
"s|
\(
Source:.*
\)
.tgz|
\1
.tar.bz2|"
$i
...
...
share/eterbuild/functions/common
View file @
f2abddd3
...
...
@@ -54,18 +54,6 @@ print_list()
done
}
# Obsoleted:
# TODO: check for .gear, not .git?
is_git
()
{
local
DIR
=
$1
[
-n
"
$DIR
"
]
&&
[
-d
"
$DIR
/.git"
]
&&
return
0
[
-d
".git"
]
&&
return
0
# hack for support spec in some subdir
[
-d
"../.gear"
]
&&
return
0
return
1
}
is_gear
()
{
local
DIR
=
$1
...
...
share/eterbuild/functions/rpm
View file @
f2abddd3
...
...
@@ -18,20 +18,22 @@ uni_rpmbuild()
local
SPECDIR
=
`
dirname
$SPECNAME
`
local
GEAR
=
gear
local
GEARBUILDREQ
=
gear-buildreq
if
[
-n
"
$USE_LEGACY_COMPRESSION
"
]
;
then
# FIXME: do not override -v
ONEPARAM
=
"--define=_source_payload w9.gzdio"
fi
# TODO: add support for git
if
[
"
$COMMAND
"
=
"buildreq"
]
;
then
if
is_g
it
$SPECDIR
;
then
if
is_g
ear
$SPECDIR
;
then
$NICE
$GEARBUILDREQ
--commit
--
$@
else
$NICE
$COMMAND
$@
fi
return
fi
if
is_git
$SPECDIR
;
then
if
is_gear
$SPECDIR
;
then
[
-f
"
$SPECNAME
"
]
||
fatal
"run uni_rpmbuild with spec as 2nd parameter"
shift
# skip spec name
[
-n
"
$SPECDIR
"
]
&&
[
"
$SPECDIR
"
!=
"."
]
&&
warning
"Spec is not in git dir"
...
...
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