Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
eepm
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
Nurlan
eepm
Commits
af231daf
An error occurred while fetching merge requests data.
Commit
af231daf
authored
2 years ago
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm-repack: fix rpm package arch (add --target to rpmbuild)
parent
b1e02a44
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
epm-repack
bin/epm-repack
+6
-3
No files found.
bin/epm-repack
View file @
af231daf
...
...
@@ -362,11 +362,14 @@ __epm_repack_to_rpm()
__apply_fix_code
$pkgname
$tmpbuilddir
/
$subdir
$spec
$pkgname
# TODO: we need these dirs to be created
to_remove_pkg_dirs
=
"
$to_remove_pkg_dirs
$HOME
/RPM/BUILD
$HOME
/RPM"
showcmd rpmbuild
--buildroot
$tmpbuilddir
/
$subdir
-bb
$spec
TARGETARCH
=
$(
epm print info
-a
|
sed
-e
's|^x86$|i586|'
)
showcmd rpmbuild
--buildroot
$tmpbuilddir
/
$subdir
--target
$TARGETARCH
-bb
$spec
if
[
-n
"
$verbose
"
]
;
then
a
=
''
rpmbuild
--buildroot
$tmpbuilddir
/
$subdir
-bb
$spec
||
fatal
a
=
''
rpmbuild
--buildroot
$tmpbuilddir
/
$subdir
-
-target
$TARGETARCH
-
bb
$spec
||
fatal
else
a
=
''
rpmbuild
--buildroot
$tmpbuilddir
/
$subdir
-bb
$spec
>
/dev/null
||
fatal
a
=
''
rpmbuild
--buildroot
$tmpbuilddir
/
$subdir
-
-target
$TARGETARCH
-
bb
$spec
>
/dev/null
||
fatal
fi
# remove copy of source binary package (don't mix with generated)
rm
-f
$tmpbuilddir
/../
$alpkg
...
...
This diff is collapsed.
Click to expand it.
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