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
041a6a13
Commit
041a6a13
authored
Apr 18, 2022
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmbb: fix on non ALT platform
parent
2b60de70
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
rpmbb
bin/rpmbb
+2
-2
rpm
share/eterbuild/functions/rpm
+4
-3
No files found.
bin/rpmbb
View file @
041a6a13
...
@@ -124,9 +124,9 @@ do
...
@@ -124,9 +124,9 @@ do
if
!
build_buildroot
;
then
if
!
build_buildroot
;
then
LISTRPMARGS
=
"--buildroot
$BUILDROOT
$LISTRPMARGS
"
LISTRPMARGS
=
"--buildroot
$BUILDROOT
$LISTRPMARGS
"
fi
fi
echo
"For non ALT distro clean BuildRoot
$BUILDROOT
"
echo
"For non ALT distro clean BuildRoot
$BUILDROOT
...
"
test
-n
"
$BUILDROOT
"
||
fatal
"BUILDROOT var is empty"
test
-n
"
$BUILDROOT
"
||
fatal
"BUILDROOT var is empty"
rm
-rf
"
$BUILDROOT
"
docmd
rm
-rf
"
$BUILDROOT
"
fi
fi
LOGFILE
=
"
$LOGDIR
/
`
basename
$NAMESRPMIN
.src.rpm
`
$MENVARG
.log"
LOGFILE
=
"
$LOGDIR
/
`
basename
$NAMESRPMIN
.src.rpm
`
$MENVARG
.log"
rm
-f
$LOGFILE
$LOGFILE
.ok
rm
-f
$LOGFILE
$LOGFILE
.ok
...
...
share/eterbuild/functions/rpm
View file @
041a6a13
...
@@ -9,13 +9,14 @@ load_mod build
...
@@ -9,13 +9,14 @@ load_mod build
# get correct BUILDROOT, run build_rpms_name before!
# get correct BUILDROOT, run build_rpms_name before!
build_buildroot
()
build_buildroot
()
{
{
local
TWOPARAM
=
"--quiet"
test
-z
"
$BASENAME
"
&&
fatal
"Use build_buildroot with BASENAME defined"
test
-z
"
$BASENAME
"
&&
fatal
"Use build_buildroot with BASENAME defined"
# ALT Only?
[
-n
"
$RPMTOPDIR
"
]
&&
TWOPARAM
=
"--define=_topdir
$RPMTOPDIR
"
BUILDROOT
=
`
rpm
--eval
%buildroot | subst_namever
`
BUILDROOT
=
`
rpm
"
$TWOPARAM
"
--eval
%buildroot | subst_namever
`
test
-z
"
$BUILDROOT
"
&&
fatal
"Fix rpm's buildroot"
test
-z
"
$BUILDROOT
"
&&
fatal
"Fix rpm's buildroot"
if
[
"
$BUILDROOT
"
=
"%buildroot"
]
;
then
if
[
"
$BUILDROOT
"
=
"%buildroot"
]
;
then
BUILDROOT
=
"
$HOME
/tmp/
$BASENAME
-buildroot"
BUILDROOT
=
"
$HOME
/tmp/
$BASENAME
-buildroot"
warning
"Can't get buildroot
from RPM
, set to
$BUILDROOT
"
warning
"Can't get buildroot
via rpm --eval
, set to
$BUILDROOT
"
return
1
return
1
fi
fi
return
0
return
0
...
...
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