sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename find-package to solve misconflict with rpm

Browse Source 
It is not that easy to ship find-package as part of rpm-build.
We have to drop find-package from the filelist of rpm as well. For this
change to enter Sisyphus, both rpm-build and rpm have to be changed and
rebuilt in their own base build chroots.

If rpm-build is built to include find-package first, rpm is
uninstallable in the base chroot due to a misconflict, so it cannot be
rebuilt.
If rpm is built to exclude find-package first, it disappears from the
base chroot altogether, making rpm-build break, so no
package can be built as well.
This commit is contained in:
Arseny Maslennikov 2024-03-04 19:04:12 +03:00
parent 44ef3a03cd
commit 76fa8b1172
10 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -930,7 +930,7 @@ AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt
scripts/files.req scripts/files.req
scripts/files.req.files scripts/files.req.files
scripts/find-lang scripts/find-lang
scripts/find-package scripts/rpmb-find-package
scripts/find-debuginfo-files scripts/find-debuginfo-files
scripts/process-debuginfo scripts/process-debuginfo
scripts/process-lto scripts/process-lto

2
rpm-4_0.spec
View File

@ -333,7 +333,7 @@ mv -T %buildroot%_rpmlibdir/{,build}macros
%rpmattr %_rpmlibdir/ldd %rpmattr %_rpmlibdir/ldd
%rpmattr %_rpmlibdir/rpm2cpio.sh %rpmattr %_rpmlibdir/rpm2cpio.sh
%rpmattr %_rpmlibdir/find-lang %rpmattr %_rpmlibdir/find-lang
%rpmattr %_rpmlibdir/find-package %rpmattr %_rpmlibdir/rpmb-find-package
%rpmattr %_rpmlibdir/find-provides %rpmattr %_rpmlibdir/find-provides
%rpmattr %_rpmlibdir/find-requires %rpmattr %_rpmlibdir/find-requires
%rpmattr %_rpmlibdir/find-debuginfo-files %rpmattr %_rpmlibdir/find-debuginfo-files

5
scripts/Makefile.am
View File

@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
EXTRA_DIST = \ EXTRA_DIST = \
posttrans-filetriggers 0ldconfig.filetrigger \ posttrans-filetriggers 0ldconfig.filetrigger \
debuginfo.req debuginfo.req.files debuginfo.prov debuginfo.prov.files \ debuginfo.req debuginfo.req.files debuginfo.prov debuginfo.prov.files \
functions find-package .provides.sh \ functions .provides.sh \
find-debuginfo-files process-debuginfo process-lto \ find-debuginfo-files process-debuginfo process-lto \
find-scriptlet-requires brp-sign-kmodules \ find-scriptlet-requires brp-sign-kmodules \
brp-adjust_libraries brp-alt \ brp-adjust_libraries brp-alt \
@ -16,6 +16,7 @@ EXTRA_DIST = \
compress_files \ compress_files \
cpp.req cpp.req.files \ cpp.req cpp.req.files \
find-lang \ find-lang \
rpmb-find-package \
fixup-binconfig fixup-pkgconfig fixup-libtool fixup-libraries \ fixup-binconfig fixup-pkgconfig fixup-libtool fixup-libraries \
fixup-desktop fixup-desktop.awk \ fixup-desktop fixup-desktop.awk \
files.req files.req.files 0common-files.req.list \ files.req files.req.files 0common-files.req.list \
@ -51,7 +52,7 @@ config_SCRIPTS = \
compress_files \ compress_files \
cpp.req cpp.req.files \ cpp.req cpp.req.files \
find-lang \ find-lang \
find-package \ rpmb-find-package \
fixup-binconfig fixup-pkgconfig fixup-libtool fixup-libraries \ fixup-binconfig fixup-pkgconfig fixup-libtool fixup-libraries \
fixup-gnuconfig fixup-desktop fixup-desktop.awk \ fixup-gnuconfig fixup-desktop fixup-desktop.awk \
files.req files.req.files \ files.req files.req.files \

2
scripts/cpp.req.in
View File

@ -8,7 +8,7 @@
# (at your option) any later version. # (at your option) any later version.
. @RPMCONFIGDIR@/rpmb-functions . @RPMCONFIGDIR@/rpmb-functions
. @RPMCONFIGDIR@/find-package . @RPMCONFIGDIR@/rpmb-find-package
. @RPMCONFIGDIR@/tmpdir.sh . @RPMCONFIGDIR@/tmpdir.sh
[ -n "${RPM_LIBDIR-}" ] || RPM_LIBDIR=`rpm --eval %_libdir` [ -n "${RPM_LIBDIR-}" ] || RPM_LIBDIR=`rpm --eval %_libdir`

2
scripts/pkgconfiglib.req.in
View File

@ -8,7 +8,7 @@
# (at your option) any later version. # (at your option) any later version.
. @RPMCONFIGDIR@/rpmb-functions . @RPMCONFIGDIR@/rpmb-functions
. @RPMCONFIGDIR@/find-package . @RPMCONFIGDIR@/rpmb-find-package
[ -n "${RPM_LIBDIR-}" ] || RPM_LIBDIR=`rpm --eval %_libdir` [ -n "${RPM_LIBDIR-}" ] || RPM_LIBDIR=`rpm --eval %_libdir`
PKG_CONFIG_PATH=$RPM_LIBDIR/pkgconfig:/usr/share/pkgconfig PKG_CONFIG_PATH=$RPM_LIBDIR/pkgconfig:/usr/share/pkgconfig

2
scripts/find-package.in → scripts/rpmb-find-package.in
View File

@ -4,7 +4,7 @@
# commands, such as found in shell scripts, to rpm dependencies. # commands, such as found in shell scripts, to rpm dependencies.
# #
# Usage: # Usage:
# . @RPMCONFIGDIR@/find-package # . @RPMCONFIGDIR@/rpmb-find-package
# FindPackage src [path...] [command...] # FindPackage src [path...] [command...]
# #
# Arguments: # Arguments:

2
scripts/shebang.req.in
View File

@ -11,7 +11,7 @@
# (at your option) any later version. # (at your option) any later version.
. @RPMCONFIGDIR@/rpmb-functions . @RPMCONFIGDIR@/rpmb-functions
. @RPMCONFIGDIR@/find-package . @RPMCONFIGDIR@/rpmb-find-package
ShebangReq() ShebangReq()
{ {

2
scripts/shell.req.in
View File

@ -20,7 +20,7 @@
# #
. @RPMCONFIGDIR@/rpmb-functions . @RPMCONFIGDIR@/rpmb-functions
. @RPMCONFIGDIR@/find-package . @RPMCONFIGDIR@/rpmb-find-package
print_sh_number_from_shebang() print_sh_number_from_shebang()
{ {

2
scripts/symlinks.req.in
View File

@ -1,7 +1,7 @@
#!/bin/sh -efu #!/bin/sh -efu
. @RPMCONFIGDIR@/rpmb-functions . @RPMCONFIGDIR@/rpmb-functions
. @RPMCONFIGDIR@/find-package . @RPMCONFIGDIR@/rpmb-find-package
SymlinkReq() SymlinkReq()
{ {

2
scripts/systemd-services.req.in
View File

@ -1,7 +1,7 @@
#!/bin/sh -efu #!/bin/sh -efu
. @RPMCONFIGDIR@/rpmb-functions . @RPMCONFIGDIR@/rpmb-functions
. @RPMCONFIGDIR@/find-package . @RPMCONFIGDIR@/rpmb-find-package
SystemdServiceReq() SystemdServiceReq()
{ {