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
acf7c7cd
Commit
acf7c7cd
authored
Oct 16, 2020
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm-repack: don't intersect with source rpm package
parent
675c1be6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
epm-repack
bin/epm-repack
+5
-4
No files found.
bin/epm-repack
View file @
acf7c7cd
...
@@ -160,7 +160,7 @@ __epm_repack_rpm()
...
@@ -160,7 +160,7 @@ __epm_repack_rpm()
local
abspkg
local
abspkg
repacked_rpms
=
''
repacked_rpms
=
''
for
pkg
in
$*
;
do
for
pkg
in
$*
;
do
local
tmpbuilddir
=
$HOME
/
repack-
$(
basename
$pkg
)
local
tmpbuilddir
=
$HOME
/
$(
basename
$pkg
)
.tmpdir
mkdir
$tmpbuilddir
mkdir
$tmpbuilddir
abspkg
=
"
$(
realpath
$pkg
)
"
abspkg
=
"
$(
realpath
$pkg
)
"
info
""
info
""
...
@@ -168,6 +168,7 @@ __epm_repack_rpm()
...
@@ -168,6 +168,7 @@ __epm_repack_rpm()
# alien failed with spaced names
# alien failed with spaced names
# alpkg=$abspkg
# alpkg=$abspkg
alpkg
=
$(
basename
$pkg
)
alpkg
=
$(
basename
$pkg
)
# don't use abs package path: copy package to temp dir and use there
cp
-v
$pkg
$tmpbuilddir
/../
$alpkg
cp
-v
$pkg
$tmpbuilddir
/../
$alpkg
cd
$tmpbuilddir
||
fatal
cd
$tmpbuilddir
||
fatal
docmd fakeroot alien
--generate
--to-rpm
$verbose
$scripts
"../
$alpkg
"
||
fatal
docmd fakeroot alien
--generate
--to-rpm
$verbose
$scripts
"../
$alpkg
"
||
fatal
...
@@ -191,8 +192,9 @@ __epm_repack_rpm()
...
@@ -191,8 +192,9 @@ __epm_repack_rpm()
else
else
a
=
''
fakeroot rpmbuild
--buildroot
$tmpbuilddir
/
$subdir
--define
=
'_allow_root_build 1'
-bb
$spec
>
/dev/null
||
fatal
a
=
''
fakeroot rpmbuild
--buildroot
$tmpbuilddir
/
$subdir
--define
=
'_allow_root_build 1'
-bb
$spec
>
/dev/null
||
fatal
fi
fi
mv
$tmpbuilddir
/../
*
.rpm
$tmpbuilddir
/
# remove copy of source binary package (don't mix with generated)
local
repacked_rpm
=
"
$(
realpath
$tmpbuilddir
/
*
.rpm
)
"
rm
-f
$tmpbuilddir
/../
$alpkg
local
repacked_rpm
=
"
$(
realpath
$tmpbuilddir
/../
*
.rpm
)
"
if
[
-s
"
$repacked_rpm
"
]
;
then
if
[
-s
"
$repacked_rpm
"
]
;
then
repacked_rpms
=
"
$repacked_rpms
$repacked_rpm
"
repacked_rpms
=
"
$repacked_rpms
$repacked_rpm
"
to_remove_pkg_files
=
"
$to_remove_pkg_files
$repacked_rpm
"
to_remove_pkg_files
=
"
$to_remove_pkg_files
$repacked_rpm
"
...
@@ -201,7 +203,6 @@ __epm_repack_rpm()
...
@@ -201,7 +203,6 @@ __epm_repack_rpm()
fi
fi
cd
-
>
/dev/null
cd
-
>
/dev/null
rm
-rf
$tmpbuilddir
/
$subdir
/
rm
-rf
$tmpbuilddir
/
$subdir
/
#rm -rf $tmpbuilddir/../*.rpm
rm
-rf
$spec
rm
-rf
$spec
done
done
...
...
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