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
3a786957
Commit
3a786957
authored
May 18, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.alt:packages/etersoft-build-utils
parents
a3de2626
cb279821
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
5 deletions
+22
-5
rpmbph
bin/rpmbph
+9
-1
common
share/eterbuild/functions/common
+3
-1
rpm
share/eterbuild/functions/rpm
+8
-3
pkgrepl.mdv.2009
share/eterbuild/pkgrepl/pkgrepl.mdv.2009
+2
-0
No files found.
bin/rpmbph
View file @
3a786957
...
...
@@ -35,7 +35,7 @@ if [ "$VENDOR" = "alt" ] ; then
set_release
$SPECNAME
alt
$(
decrement_release
$BASERELEASE
)
.
$MDISTR
.
$BASERELEASE
ADDDEF
=
""
CLEANTEXT
=
""
# due new libtool
# due new libtool
, affected on ALT Linux
RECONFT
=
"%undefine __libtoolize"
else
# Need our compat package and disable strong patch checking
...
...
@@ -46,9 +46,15 @@ else
CLEANTEXT
=
""
fi
if
[
"
$VENDOR
"
=
"mdv"
]
||
[
"
$VENDOR
"
=
"pclinux"
]
;
then
# due new libtool, affected on Mandriva 2009.0
RECONFT
=
"%define _disable_libtoolize 1"
fi
# Do not add BuildReq if already exist
cat
$SPECNAME
|
grep
rpm-build-compat &>/dev/null
&&
BUILDREQ
=
"
$FIXPATCHFUZZ
"
# TODO: fix readlink -m, introduced by new libtool and missed in RHEL4 (replace with readlink -e)
# fix mktemp using for MCBC
if
[
"
$VENDOR
"
=
"mcbc"
]
;
then
FIXMKTEMP
=
"%__subst "
s|mktemp
-dt
|mktemp
-d
|g
" configure"
...
...
@@ -193,6 +199,8 @@ if [ "$VENDOR" = "alt" ] ; then
else
subst
"1i# This spec is autoported from ALT Linux Sisyphus to
`
distr_vendor
-d
`
$DISTRVERSION
automatically by rpmbph script. Do not edit it."
$SPECNAME
ENTRY
=
"- autoport to
`
distr_vendor
-d
`
$DISTRVERSION
(by rpmbph script)"
#DISTRARG="--define '_vendor $VENDOR'"
export
USE_VENDOR
=
$VENDOR
DISTRARG
=
""
fi
...
...
share/eterbuild/functions/common
View file @
3a786957
...
...
@@ -12,6 +12,7 @@ set_eterbuilddir()
ETERBUILDDIR
=
/usr/share/eterbuild
else
# if run from no system installation
# TODO: use real root dir not script dirname
ETERBUILDDIR
=
$(
realpath
`
dirname
$0
`
/../share/eterbuild
)
ETERBUILDETC
=
$(
realpath
`
dirname
$0
`
/../etc
)
if
[
-r
"
$ETERBUILDETC
/../AUTHORS"
]
;
then
...
...
@@ -19,11 +20,12 @@ set_eterbuilddir()
echo
"Note: run from source tree, datadir=
$ETERBUILDDIR
, sysconfdir=
$ETERBUILDETC
"
fi
else
warning
"Cannot find source tree root in source tree mode"
ETERBUILDETC
=
/etc/eterbuild
ETERBUILDDIR
=
/usr/share/eterbuild
fi
fi
ETERBUILDBIN
=
$(
rea
dlink
-f
$ETERBUILDDIR
/../../bin
)
ETERBUILDBIN
=
$(
rea
lpath
$ETERBUILDDIR
/../../bin
)
test
-n
"
$ETERBUILDDIR
"
# returns test result
}
...
...
share/eterbuild/functions/rpm
View file @
3a786957
...
...
@@ -15,6 +15,7 @@ uni_rpmbuild()
# just for fill by something
local
ONEPARAM
=
"-v"
local
TWOPARAM
=
"-v"
local
THRPARAM
=
"-v"
local
SPECNAME
=
$1
local
SPECDIR
=
`
dirname
$SPECNAME
`
...
...
@@ -24,6 +25,10 @@ uni_rpmbuild()
# FIXME: do not override -v
ONEPARAM
=
"--define=_source_payload w9.gzdio"
fi
if
[
-n
"
$USE_VENDOR
"
]
;
then
THRPARAM
=
"--define=_vendor
$USE_VENDOR
"
fi
if
[
-n
"
$RPMTOPDIR
"
]
;
then
TWOPARAM
=
"--define=_topdir
$RPMTOPDIR
"
...
...
@@ -35,7 +40,7 @@ uni_rpmbuild()
#[ -n "$SPECDIR" ] && [ "$SPECDIR" != "." ] && warning "Spec is not in git dir (SPECDIR='$SPECDIR')"
# build package without MENV checking
if
true
||
[
"
$MENV
"
=
"SS"
]
;
then
$NICE
$GEAR
--commit
--rpmbuild
--
$RPMBUILD
"
$ONEPARAM
"
"
$TWOPARAM
"
$@
||
RET
=
$?
$NICE
$GEAR
--commit
--rpmbuild
--
$RPMBUILD
"
$ONEPARAM
"
"
$TWOPARAM
"
"
$THRPARAM
"
$@
||
RET
=
$?
else
fatal
"Build backported src.rpm from git is unsupported now"
# build src.rpm via hasher (on ALT)
...
...
@@ -44,9 +49,9 @@ uni_rpmbuild()
fi
else
mkdir
-p
$RPMTOPDIR
/BUILD
$RPMTOPDIR
/SRPMS
$NICE
$RPMBUILD
"
$ONEPARAM
"
"
$TWOPARAM
"
$@
||
RET
=
$?
$NICE
$RPMBUILD
"
$ONEPARAM
"
"
$TWOPARAM
"
"
$THRPARAM
"
$@
||
RET
=
$?
fi
[
-n
"
$VERBOSE
"
]
&&
echo
"Run
$RPMBUILD
$ONEPARAM
$TWOPARAM
$@
"
||
:
[
-n
"
$VERBOSE
"
]
&&
echo
"Run
$RPMBUILD
$ONEPARAM
$TWOPARAM
$
THRPARAM
$
@
"
||
:
return
$RET
}
...
...
share/eterbuild/pkgrepl/pkgrepl.mdv.2009
View file @
3a786957
libxslt-devel|libxslt-devel
jackit-devel|libjack-devel
libreadline-devel|libreadline-devel
libreadline|libreadline6
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