Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

epm: fix add_unirequires if the package contains files of different architectures (eterbug #17610) #231

Merged
merged 2 commits into from
Aug 20, 2024
+9 −4
Merged

epm: fix add_unirequires if the package contains files of different architectures (eterbug #17610) #231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
464021b
added requires bit to __get_binary_requires
Boria138 Aug 20, 2024
4086830
added add_directrequires function
Boria138 Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions repack.d/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,12 @@ add_requires()
__add_tag_after_d "Requires: $*"
}

add_directrequires()
{
[ -n "$1" ] || return
__add_tag_after_d "Requires: $*"
}

add_conflicts()
{
[ -n "$1" ] || return
Expand Down Expand Up @@ -375,7 +381,6 @@ add_unirequires()
fi
}


install_requires()
{
[ -n "$1" ] || return
Expand All @@ -402,10 +407,10 @@ __get_binary_requires()
local fdir="$1"

info " Getting executable requires ..."
epm req --short $(find "$fdir" -type f -executable) </dev/null 2>/dev/null | sed -e 's|().*||'
epm req --short $(find "$fdir" -type f -executable) </dev/null 2>/dev/null

info " Getting libs requires ..."
epm req --short $(find "$fdir" -type f -name "lib*.so*") </dev/null 2>/dev/null | sed -e 's|().*||'
epm req --short $(find "$fdir" -type f -name "lib*.so*") </dev/null 2>/dev/null
}

__get_library_provides()
Expand Down Expand Up @@ -459,7 +464,7 @@ add_libs_requires()
info "Scanning for required libs soname ..."
get_libs_requires | xargs -n6 echo | grep -ve '^$' | while read ll ; do
info "Requires: $ll"
add_unirequires "$ll" </dev/null
add_directrequires "$ll" </dev/null
done
}

Expand Down