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
etersoft
eepm
Commits
198bd0d8
Commit
198bd0d8
authored
Apr 02, 2024
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm-repack-rpm: check package name after spec fixing
parent
14fe036a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
epm-repack-rpm
bin/epm-repack-rpm
+9
-6
No files found.
bin/epm-repack-rpm
View file @
198bd0d8
...
@@ -218,12 +218,6 @@ __epm_repack_to_rpm()
...
@@ -218,12 +218,6 @@ __epm_repack_to_rpm()
# run generic scripts and repack script for the pkg
# run generic scripts and repack script for the pkg
cd
$buildroot
||
fatal
cd
$buildroot
||
fatal
if
[
-n
"
$EEPM_INTERNAL_PKGNAME
"
]
;
then
if
!
estrlist contains
"
$pkgname
"
"
$EEPM_INTERNAL_PKGNAME
"
;
then
fatal
"Some bug: the name of the repacking package (
$pkgname
) differs with the package name (
$EEPM_INTERNAL_PKGNAME
) from play.d script."
fi
fi
__fix_spec
$pkgname
$buildroot
$spec
__fix_spec
$pkgname
$buildroot
$spec
__apply_fix_code
"generic"
$buildroot
$spec
$pkgname
$abspkg
$SUBGENERIC
__apply_fix_code
"generic"
$buildroot
$spec
$pkgname
$abspkg
$SUBGENERIC
__apply_fix_code
"generic-
$SUBGENERIC
"
$buildroot
$spec
$pkgname
$abspkg
__apply_fix_code
"generic-
$SUBGENERIC
"
$buildroot
$spec
$pkgname
$abspkg
...
@@ -234,6 +228,15 @@ __epm_repack_to_rpm()
...
@@ -234,6 +228,15 @@ __epm_repack_to_rpm()
__fix_spec
$pkgname
$buildroot
$spec
__fix_spec
$pkgname
$buildroot
$spec
cd
-
>
/dev/null
cd
-
>
/dev/null
# reassign package name (could be renamed in fix scripts)
pkgname
=
"
$(
grep
"^Name: "
$spec
|
sed
-e
"s|Name: ||g"
|
head
-n1
)
"
if
[
-n
"
$EEPM_INTERNAL_PKGNAME
"
]
;
then
if
!
estrlist contains
"
$pkgname
"
"
$EEPM_INTERNAL_PKGNAME
"
;
then
fatal
"Some bug: the name of the repacking package (
$pkgname
) differs with the package name (
$EEPM_INTERNAL_PKGNAME
) from play.d script."
fi
fi
TARGETARCH
=
$(
epm print info
-a
|
sed
-e
's|^x86$|i586|'
)
TARGETARCH
=
$(
epm print info
-a
|
sed
-e
's|^x86$|i586|'
)
showcmd
$RPMBUILD
--buildroot
$buildroot
--target
$TARGETARCH
-bb
$spec
showcmd
$RPMBUILD
--buildroot
$buildroot
--target
$TARGETARCH
-bb
$spec
...
...
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