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
Vladislav
eepm
Commits
6a272229
Commit
6a272229
authored
Aug 21, 2023
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm repack: skip ALT only macros using when epm-rpm-build is used
parent
c486c113
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
epm-repack-rpm
bin/epm-repack-rpm
+1
-0
common.sh
repack.d/common.sh
+4
-0
generic.sh
repack.d/generic.sh
+1
-1
No files found.
bin/epm-repack-rpm
View file @
6a272229
...
...
@@ -117,6 +117,7 @@ __epm_repack_to_rpm()
if
[
-x
$RPMBUILD
]
;
then
warning
"will use eepm-rpmbuild for rpm packing"
export
EPM_RPMBUILD
=
$RPMBUILD
else
RPMBUILD
=
/usr/bin/rpmbuild
# TODO: check for all systems
...
...
repack.d/common.sh
View file @
6a272229
...
...
@@ -399,6 +399,8 @@ add_by_ldd_deps()
filter_from_requires
()
{
# hack for uncompatible rpm-build
[
-n
"
$EPM_RPMBUILD
"
]
&&
return
local
i
for
i
in
"
$@
"
;
do
local
ti
=
"
$(
echo
"
$i
"
|
sed
-e
's|^/|\\\\/|'
-e
's|\([^\]\)/|\1\\\\/|g'
)
"
...
...
@@ -408,6 +410,8 @@ filter_from_requires()
add_findreq_skiplist
()
{
# hack for uncompatible rpm-build
[
-n
"
$EPM_RPMBUILD
"
]
&&
return
local
i
for
i
in
"
$@
"
;
do
subst
"1i%add_findreq_skiplist
$i
"
$SPEC
...
...
repack.d/generic.sh
View file @
6a272229
...
...
@@ -32,7 +32,7 @@ find $BUILDROOT -name "*.py" | grep -q "\.py$" && flag_python3=1
find
$BUILDROOT
-name
"*.py"
-exec
sed
-i
-e
'1{/python3/n};1i#!/usr/bin/python3'
{}
\;
if
[
-n
"
$flag_python3
"
]
;
then
if
[
"
$(
epm print info
-s
)
"
=
"alt"
]
;
then
if
[
"
$(
epm print info
-s
)
"
=
"alt"
]
&&
[
-z
"
$EPM_RPMBUILD
"
]
;
then
epm
install
--skip-installed
rpm-build-python3
subst
"1i%add_python3_lib_path /usr"
$SPEC
# by some unknown reason there are no packages provide that (https://github.com/Etersoft/eepm/issues/22)
...
...
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