Rename find-package to solve misconflict with rpm
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:
parent
44ef3a03cd
commit
76fa8b1172
@ -930,7 +930,7 @@ AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt
|
||||
scripts/files.req
|
||||
scripts/files.req.files
|
||||
scripts/find-lang
|
||||
scripts/find-package
|
||||
scripts/rpmb-find-package
|
||||
scripts/find-debuginfo-files
|
||||
scripts/process-debuginfo
|
||||
scripts/process-lto
|
||||
|
@ -333,7 +333,7 @@ mv -T %buildroot%_rpmlibdir/{,build}macros
|
||||
%rpmattr %_rpmlibdir/ldd
|
||||
%rpmattr %_rpmlibdir/rpm2cpio.sh
|
||||
%rpmattr %_rpmlibdir/find-lang
|
||||
%rpmattr %_rpmlibdir/find-package
|
||||
%rpmattr %_rpmlibdir/rpmb-find-package
|
||||
%rpmattr %_rpmlibdir/find-provides
|
||||
%rpmattr %_rpmlibdir/find-requires
|
||||
%rpmattr %_rpmlibdir/find-debuginfo-files
|
||||
|
@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
|
||||
EXTRA_DIST = \
|
||||
posttrans-filetriggers 0ldconfig.filetrigger \
|
||||
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-scriptlet-requires brp-sign-kmodules \
|
||||
brp-adjust_libraries brp-alt \
|
||||
@ -16,6 +16,7 @@ EXTRA_DIST = \
|
||||
compress_files \
|
||||
cpp.req cpp.req.files \
|
||||
find-lang \
|
||||
rpmb-find-package \
|
||||
fixup-binconfig fixup-pkgconfig fixup-libtool fixup-libraries \
|
||||
fixup-desktop fixup-desktop.awk \
|
||||
files.req files.req.files 0common-files.req.list \
|
||||
@ -51,7 +52,7 @@ config_SCRIPTS = \
|
||||
compress_files \
|
||||
cpp.req cpp.req.files \
|
||||
find-lang \
|
||||
find-package \
|
||||
rpmb-find-package \
|
||||
fixup-binconfig fixup-pkgconfig fixup-libtool fixup-libraries \
|
||||
fixup-gnuconfig fixup-desktop fixup-desktop.awk \
|
||||
files.req files.req.files \
|
||||
|
@ -8,7 +8,7 @@
|
||||
# (at your option) any later version.
|
||||
|
||||
. @RPMCONFIGDIR@/rpmb-functions
|
||||
. @RPMCONFIGDIR@/find-package
|
||||
. @RPMCONFIGDIR@/rpmb-find-package
|
||||
. @RPMCONFIGDIR@/tmpdir.sh
|
||||
|
||||
[ -n "${RPM_LIBDIR-}" ] || RPM_LIBDIR=`rpm --eval %_libdir`
|
||||
|
@ -8,7 +8,7 @@
|
||||
# (at your option) any later version.
|
||||
|
||||
. @RPMCONFIGDIR@/rpmb-functions
|
||||
. @RPMCONFIGDIR@/find-package
|
||||
. @RPMCONFIGDIR@/rpmb-find-package
|
||||
|
||||
[ -n "${RPM_LIBDIR-}" ] || RPM_LIBDIR=`rpm --eval %_libdir`
|
||||
PKG_CONFIG_PATH=$RPM_LIBDIR/pkgconfig:/usr/share/pkgconfig
|
||||
|
@ -4,7 +4,7 @@
|
||||
# commands, such as found in shell scripts, to rpm dependencies.
|
||||
#
|
||||
# Usage:
|
||||
# . @RPMCONFIGDIR@/find-package
|
||||
# . @RPMCONFIGDIR@/rpmb-find-package
|
||||
# FindPackage src [path...] [command...]
|
||||
#
|
||||
# Arguments:
|
@ -11,7 +11,7 @@
|
||||
# (at your option) any later version.
|
||||
|
||||
. @RPMCONFIGDIR@/rpmb-functions
|
||||
. @RPMCONFIGDIR@/find-package
|
||||
. @RPMCONFIGDIR@/rpmb-find-package
|
||||
|
||||
ShebangReq()
|
||||
{
|
||||
|
@ -20,7 +20,7 @@
|
||||
#
|
||||
|
||||
. @RPMCONFIGDIR@/rpmb-functions
|
||||
. @RPMCONFIGDIR@/find-package
|
||||
. @RPMCONFIGDIR@/rpmb-find-package
|
||||
|
||||
print_sh_number_from_shebang()
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/bin/sh -efu
|
||||
|
||||
. @RPMCONFIGDIR@/rpmb-functions
|
||||
. @RPMCONFIGDIR@/find-package
|
||||
. @RPMCONFIGDIR@/rpmb-find-package
|
||||
|
||||
SymlinkReq()
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
#!/bin/sh -efu
|
||||
|
||||
. @RPMCONFIGDIR@/rpmb-functions
|
||||
. @RPMCONFIGDIR@/find-package
|
||||
. @RPMCONFIGDIR@/rpmb-find-package
|
||||
|
||||
SystemdServiceReq()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user