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
4e2ddf6f
Commit
4e2ddf6f
authored
Dec 10, 2008
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
run external scripts with system function path
parent
09b82b38
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
common
share/eterbuild/functions/common
+9
-2
spec
share/eterbuild/functions/spec
+4
-4
No files found.
share/eterbuild/functions/common
View file @
4e2ddf6f
...
@@ -14,7 +14,12 @@ set_eterbuilddir()
...
@@ -14,7 +14,12 @@ set_eterbuilddir()
# if run from no system installation
# if run from no system installation
ETERBUILDDIR
=
$(
realpath
`
dirname
$0
`
/../share/eterbuild
)
ETERBUILDDIR
=
$(
realpath
`
dirname
$0
`
/../share/eterbuild
)
ETERBUILDETC
=
$(
realpath
`
dirname
$0
`
/../etc
)
ETERBUILDETC
=
$(
realpath
`
dirname
$0
`
/../etc
)
echo
"Note: run from source tree, datadir=
$ETERBUILDDIR
, sysconfdir=
$ETERBUILDETC
"
if
[
-r
"
$ETERBUILDETC
/../AUTHORS"
]
;
then
echo
"Note: run from source tree, datadir=
$ETERBUILDDIR
, sysconfdir=
$ETERBUILDETC
"
else
ETERBUILDETC
=
/etc/eterbuild
ETERBUILDDIR
=
/usr/share/eterbuild
fi
fi
fi
test
-n
"
$ETERBUILDDIR
"
test
-n
"
$ETERBUILDDIR
"
# returns test result
# returns test result
...
@@ -169,7 +174,9 @@ set_incoming()
...
@@ -169,7 +174,9 @@ set_incoming()
add_changelog_helper
()
add_changelog_helper
()
{
{
# don't work sometime?
# don't work sometime?
if
!
tty
-s
&&
[
-z
"
$@
"
]
;
then
# TODO: fix with $@, single arg?
local
DESC SPEC
if
!
tty
-s
&&
[
-z
"
$DESC
"
]
;
then
echo
"skip changelog fixing without tty"
echo
"skip changelog fixing without tty"
return
1
return
1
fi
fi
...
...
share/eterbuild/functions/spec
View file @
4e2ddf6f
...
@@ -14,11 +14,11 @@ eval_spec()
...
@@ -14,11 +14,11 @@ eval_spec()
{
{
# Hack: just print spec if -bE failed
# Hack: just print spec if -bE failed
# TODO: use rpm -showrc instead -bE for get main variables?
# TODO: use rpm -showrc instead -bE for get main variables?
if
is_alt
;
then
#
if is_alt ; then
$RPMBUILD
-bE
--target
$DEFAULTARCH
$RPMBUILDARG
$@
||
fatal
"Check spec's fields"
#
$RPMBUILD -bE --target $DEFAULTARCH $RPMBUILDARG $@ || fatal "Check spec's fields"
else
#
else
$RPMBUILD
-bE
--target
$DEFAULTARCH
$RPMBUILDARG
$@
2>/dev/null
||
cat
$1
$RPMBUILD
-bE
--target
$DEFAULTARCH
$RPMBUILDARG
$@
2>/dev/null
||
cat
$1
fi
#
fi
}
}
get_release
()
get_release
()
...
...
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