forked from kiss-community/kiss
kiss: pkg_find() only gen glob onc.
This commit is contained in:
parent
527dd10adc
commit
0eddd6f612
14
kiss
14
kiss
@ -262,10 +262,17 @@ pkg_fixdeps() {
|
|||||||
# reference to 'diff' against.
|
# reference to 'diff' against.
|
||||||
[ -f depends ] && cp -f depends depends-copy
|
[ -f depends ] && cp -f depends depends-copy
|
||||||
|
|
||||||
|
# Generate a list of all installed manifests.
|
||||||
|
pkg_name=$1
|
||||||
|
set +f
|
||||||
|
set -f -- "$sys_db/"*/manifest
|
||||||
|
|
||||||
# Get a list of binaries and libraries, false files
|
# Get a list of binaries and libraries, false files
|
||||||
# will be found, however it's faster to get 'ldd' to check
|
# will be found, however it's faster to get 'ldd' to check
|
||||||
# them anyway than to filter them out.
|
# them anyway than to filter them out.
|
||||||
find "$pkg_dir/$1" -type f 2>/dev/null | while read -r file; do
|
find "$pkg_dir/$pkg_name" -type f 2>/dev/null |
|
||||||
|
|
||||||
|
while read -r file; do
|
||||||
# Run 'ldd' on the file and parse each line. The code
|
# Run 'ldd' on the file and parse each line. The code
|
||||||
# then checks to see which packages own the linked
|
# then checks to see which packages own the linked
|
||||||
# libraries and it prints the result.
|
# libraries and it prints the result.
|
||||||
@ -278,7 +285,7 @@ pkg_fixdeps() {
|
|||||||
dep=${dep% *}
|
dep=${dep% *}
|
||||||
|
|
||||||
# Figure out which package owns the file.
|
# Figure out which package owns the file.
|
||||||
dep=$(set +f; grep -lFx "${dep##$KISS_ROOT}" "$sys_db/"*/manifest)
|
dep=$(grep -lFx "${dep##$KISS_ROOT}" "$@")
|
||||||
|
|
||||||
# Extract package name from 'grep' match.
|
# Extract package name from 'grep' match.
|
||||||
dep=${dep%/*}
|
dep=${dep%/*}
|
||||||
@ -492,8 +499,7 @@ pkg_build() {
|
|||||||
log "$pkg" "Starting build"
|
log "$pkg" "Starting build"
|
||||||
|
|
||||||
# Call the build script.
|
# Call the build script.
|
||||||
"$repo_dir/build" "$pkg_dir/$pkg" >>"${KISS_BFD:=/dev/fd/0}" 2>&1 ||
|
"$repo_dir/build" "$pkg_dir/$pkg" || die "$pkg" "Build failed"
|
||||||
die "$pkg" "Build failed"
|
|
||||||
|
|
||||||
# Copy the repository files to the package directory.
|
# Copy the repository files to the package directory.
|
||||||
# This acts as the database entry.
|
# This acts as the database entry.
|
||||||
|
Loading…
Reference in New Issue
Block a user