updated version that takes packages from common-build-dep into account
This commit is contained in:
Karsten Hopp
parent
b53ffe027a
commit
650dee0123
1 changed files with 72 additions and 22 deletions
|
|
@ -27,21 +27,43 @@ moduleprofilefile=`mktemp moduleprofile.XXX`
|
|||
alreadyprocessed=`mktemp moduledepprocessed.XXX`
|
||||
brtrepo="https://kojipkgs.stg.fedoraproject.org/compose/branched/jkaluza/latest-Boltron-26/compose/base-runtime/x86_64/os/"
|
||||
|
||||
solvedbuilddeps=("hostname" "multilib-rpm-config" "help2man" "autoconf" "automake" "golang" "perl" "perl-Algorithm-Diff" "perl-Archive-Tar" \
|
||||
"perl-Archive-Zip" "perl-autodie" "perl-B-Debug" "perl-bignum" "perl-Carp" "perl-Compress-Bzip2" "perl-Compress-Raw-Bzip2" \
|
||||
"perl-Compress-Raw-Zlib" "perl-Config-Perl-V" "perl-constant" "perl-CPAN" "perl-CPAN-Meta" "perl-CPAN-Meta-Requirements" \
|
||||
"perl-CPAN-Meta-YAML" "perl-Data-Dumper" "perl-Data-OptList" "perl-Data-Section" "perl-DB_File" "perl-Devel-PPPort" \
|
||||
"perl-Devel-Size" "perl-Digest" "perl-Digest-MD5" "perl-Digest-SHA" "perl-Encode" "perl-Env" "perl-experimental" "perl-Exporter" \
|
||||
"perl-ExtUtils-CBuilder" "perl-ExtUtils-Install" "perl-ExtUtils-MakeMaker" "perl-ExtUtils-Manifest" "perl-ExtUtils-ParseXS" \
|
||||
"perl-Fedora-VSP" "perl-File-Fetch" "perl-File-HomeDir" "perl-File-Path" "perl-File-Temp" "perl-File-Which" "perl-Filter" \
|
||||
"perl-Filter-Simple" "perl-generators" "perl-Getopt-Long" "perl-HTTP-Tiny" "perl-inc-latest" "perl-IO-Compress" \
|
||||
"perl-IO-Socket-IP" "perl-IPC-Cmd" "perl-IPC-System-Simple" "perl-IPC-SysV" "perl-JSON-PP" "perl-libnet" "perl-local-lib" \
|
||||
"perl-Locale-Codes" "perl-Locale-Maketext" "perl-Math-BigInt" "perl-Math-BigInt-FastCalc" "perl-Math-BigRat" "perl-MIME-Base64" \
|
||||
"perl-Module-Build" "perl-Module-CoreList" "perl-Module-Load" "perl-Module-Load-Conditional" "perl-Module-Metadata" \
|
||||
"perl-MRO-Compat" "perl-Package-Generator" "perl-Params-Check" "perl-Params-Util" "perl-parent" "perl-PathTools" \
|
||||
"perl-Perl-OSType" "perl-perlfaq" "perl-PerlIO-via-QuotedPrint" "perl-Pod-Checker" "perl-Pod-Escapes" "perl-Pod-Parser" \
|
||||
"perl-Pod-Perldoc" "perl-Pod-Simple" "perl-Pod-Usage" "perl-podlators" "perl-Scalar-List-Utils" "perl-Socket" "perl-Software-License" \
|
||||
"perl-Storable" "perl-Sub-Exporter" "perl-Sub-Install" "perl-Sys-Syslog" "perl-Term-ANSIColor" "perl-Term-Cap" "perl-Test-Harness" \
|
||||
"perl-Test-Simple" "perl-Text-Balanced" "perl-Text-Diff" "perl-Text-Glob" "perl-Text-ParseWords" "perl-Text-Tabs+Wrap" \
|
||||
"perl-Text-Template" "perl-Thread-Queue" "perl-threads" "perl-threads-shared" "perl-Time-HiRes" "perl-Time-Local" \
|
||||
"perl-Unicode-Collate" "perl-Unicode-Normalize" "perl-URI" "perl-version" \
|
||||
"cmake" "xapian-core" "libtool" "doxygen" )
|
||||
|
||||
debug() {
|
||||
echo "$@" 1>&2
|
||||
# return
|
||||
}
|
||||
|
||||
#usage: containsElement "blaha" "${array[@]}"
|
||||
# returns 0 (true) if element is in array
|
||||
# returns 1 (false) if element is not in array
|
||||
containsElement () {
|
||||
local e
|
||||
for e in "${@:2}"; do [[ "$e" == "$1" ]] && return 0; done
|
||||
for e in "${@:2}"; do [ "$e" == "$1" ] && return 0; done
|
||||
return 1
|
||||
}
|
||||
|
||||
gather_modulemd_rpms() {
|
||||
if [ "${1}" != "" ]; then
|
||||
debug "gather_modulemd_rpms adding $binaryrpm_srpm to rpm list"
|
||||
debug "gather_modulemd_rpms adding ${1} to rpm list"
|
||||
echo " ${1}:" >> $modulerpmsfile
|
||||
echo " rationale: ${@:2}" >> $modulerpmsfile
|
||||
echo " ref: f26" >> $modulerpmsfile
|
||||
|
|
@ -50,14 +72,14 @@ gather_modulemd_rpms() {
|
|||
|
||||
gather_profile() {
|
||||
if [ "${1}" != "" ]; then
|
||||
debug "gather_profile adding $binaryrpm to profile"
|
||||
debug "gather_profile adding ${1} to profile"
|
||||
echo " - ${1}" >> $moduleprofilefile
|
||||
fi
|
||||
}
|
||||
|
||||
gather_api() {
|
||||
if [ "${1}" != "" ]; then
|
||||
debug "gather_api adding $binaryrpm to api"
|
||||
debug "gather_api adding ${1} to api"
|
||||
echo " - ${1}" >> $moduleapifile
|
||||
fi
|
||||
}
|
||||
|
|
@ -69,14 +91,18 @@ brtrpms=(`grep -e "^+\|^*" api.txt | cut -f 2 | sed -e "s/-[^-]*-[^-]*$//"`)
|
|||
|
||||
for binaryrpm in $*; do
|
||||
debug "working on $binaryrpm"
|
||||
if containsElement "$binaryrpm" "${brtrpms[@]}" -eq 1 ; then
|
||||
if containsElement "$binaryrpm" "${brtrpms[@]}" ; then
|
||||
debug "$binaryrpm is already in BRT"
|
||||
continue
|
||||
fi
|
||||
if containsElement "$binaryrpm" "${modulerpms[@]}" -eq 1 ; then
|
||||
if containsElement "$binaryrpm" "${modulerpms[@]}" ; then
|
||||
debug "$binaryrpm is already in the list of deps for this module"
|
||||
continue
|
||||
fi
|
||||
if containsElement "$binaryrpm" "${solvedbuilddeps[@]}" ; then
|
||||
debug "$binaryrpm is already in common-build-deps or in bootstrap"
|
||||
continue
|
||||
fi
|
||||
binaryrpm_srpm=`dnf repoquery --releasever 26 -q --qf "%{SOURCERPM}" --whatprovides "$binaryrpm" 2>/dev/null | tail -1 | sed -e "s/-[^-]*-[^-]*.src.rpm//"`
|
||||
if [ "$binaryrpm_srpm" == "" ]; then
|
||||
debug "no source rpm found for $binaryrpm"
|
||||
|
|
@ -84,34 +110,38 @@ for binaryrpm in $*; do
|
|||
fi
|
||||
gather_profile $binaryrpm
|
||||
gather_api $binaryrpm
|
||||
if containsElement "$binaryrpm" "${modulerpms[@]}" -eq 1 ; then
|
||||
if containsElement "$binaryrpm" "${modulerpms[@]}" ; then
|
||||
gather_modulemd_rpms $binaryrpm_srpm "Component for shared userspace - $binaryrpm."
|
||||
modulerpms+=($binaryrpm_srpm)
|
||||
fi
|
||||
# FIXME recursive: ?
|
||||
#deps=`dnf repoquery --releasever 26 --arch src -q --requires $binaryrpm_srpm 2>/dev/null | sed -e "s/ .*$//"`
|
||||
# dnf repoquery is broken wrt. src rpm requirements, use yum repoquery here:
|
||||
# deps has a list of dependencies that the source RPM of a package given on the cmdline has
|
||||
deps=`repoquery --enablerepo fedora-source --releasever 26 --arch src -q --requires $binaryrpm_srpm 2>/dev/null | sed -e "s/ .*$//"`
|
||||
#debug "deps: $deps"
|
||||
for dep in $deps; do
|
||||
grep -q "$dep" $alreadyprocessed && continue
|
||||
echo "$dep" >> $alreadyprocessed
|
||||
bdep=`dnf repoquery --releasever 26 -q --whatprovides "$dep" 2>/dev/null | tail -1 | sed -e "s/-[^-]*-[^-]*$//"`
|
||||
debug "working on $bdep"
|
||||
if containsElement "$bdep" "${brtrpms[@]}" -eq 1 ; then
|
||||
# bdep is a binary package that provides one of the source rpm dependencies
|
||||
bdep=`repoquery --releasever 26 -q --whatprovides "$dep" 2>/dev/null | tail -1 | sed -e "s/-[^-]*-[^-]*$//"`
|
||||
if containsElement "$bdep" "${brtrpms[@]}" ; then
|
||||
debug "$bdep is already in BRT"
|
||||
continue
|
||||
fi
|
||||
|
||||
if containsElement "$bdep" "${modulerpms[@]}" -eq 1 ; then
|
||||
if containsElement "$bdep" "${modulerpms[@]}" ; then
|
||||
debug "$bdep is already in the list of deps for this module"
|
||||
continue
|
||||
fi
|
||||
debug "adding 5 $bdep to modulerpms"
|
||||
modulerpms+=($bdep)
|
||||
sdep=`dnf repoquery --releasever 26 -q --qf "%{SOURCERPM}" --whatprovides "$dep" 2>/dev/null | tail -1 | sed -e "s/-[^-]*-[^-]*.src.rpm//"`
|
||||
if containsElement "sdep" "${modulerpms[@]}" -ne 1 ; then
|
||||
# modulerpms+=($bdep)
|
||||
# sdep is a source rpm that provides one of the dependencies of a package given on the cmdline (its srpm)
|
||||
sdep=`repoquery --releasever 26 -q --qf "%{SOURCERPM}" --whatprovides "$dep" 2>/dev/null | tail -1 | sed -e "s/-[^-]*-[^-]*.src.rpm//"`
|
||||
if containsElement "$sdep" "${solvedbuilddeps[@]}" ; then
|
||||
debug "$sdep already in common-build-deps or in bootstrap"
|
||||
continue
|
||||
fi
|
||||
if ! containsElement "$sdep" "${modulerpms[@]}" ; then
|
||||
debug "$sdep not in modulerpms, adding"
|
||||
modulerpms+=($sdep)
|
||||
gather_modulemd_rpms $sdep "Requirement for ${binaryrpm}."
|
||||
continue
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
|
@ -128,9 +158,13 @@ data:
|
|||
module: [ MIT ]
|
||||
dependencies:
|
||||
buildrequires:
|
||||
base_runtime: master
|
||||
base-runtime: master
|
||||
perl: master
|
||||
common-build-dependencies-bootstrap: master
|
||||
common-build-dependencies: master
|
||||
requires:
|
||||
base_runtime: master
|
||||
base-runtime: master
|
||||
perl: master
|
||||
references:
|
||||
community: https://fedoraproject.org/wiki/Modularity
|
||||
documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules
|
||||
|
|
@ -148,8 +182,24 @@ cat $moduleapifile
|
|||
cat << EOT
|
||||
components:
|
||||
rpms:
|
||||
xapian-core:
|
||||
rationale: Build dep of doxygen.
|
||||
ref: private-karsten-modularity
|
||||
buildorder: 1
|
||||
cmake:
|
||||
rationale: Build dep for many packages.
|
||||
ref: private-karsten-modularity
|
||||
buildorder: 1
|
||||
libtool:
|
||||
rationale: Build dep for many packages.
|
||||
ref: private-karsten-modularity
|
||||
buildorder: 1
|
||||
doxygen:
|
||||
rationale: Build dep for many packages.
|
||||
ref: private-karsten-modularity
|
||||
buildorder: 2
|
||||
EOT
|
||||
cat $modulerpmsfile
|
||||
|
||||
rm -f $moduleprofilefile $moduleapifile $modulerpmsfile $alreadyprocessed
|
||||
#rm -f $moduleprofilefile $moduleapifile $modulerpmsfile $alreadyprocessed
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue