janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

doc, make, scripts: Add support for [pkg.conflicts.xxx]

Browse source 
Since the packaging machinery is pretty complicated, the information about
conflicting packages had to be passed through many APIs. The last commit
contained a patch which is left in the tree to have it in one file, it actually
is identical to this commit's diff, though. Git would save me that quirk.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-06-26 10:34:22 +00:00
commit c42e386c76
7 changed files with 100 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/mkspec-wrapper.sh
View file

@ -18,7 +18,7 @@ usage()
[ "$1" ] && exit $1
}
set -- `getopt P:T:V:S:N:hR:D:d: "$@"`
set -- `getopt P:T:V:S:N:hR:D:X:Y:d: "$@"`
while [ "$1" != -- ]; do
case $1 in
@ -42,12 +42,24 @@ case $1 in
shift
done
;;
-X)
while [ "`echo $2 | cut -c1`" != "-" ]; do
CONFLICTS_RUN="$CONFLICTS_RUN $2"
shift
done
;;
-D)
while [ "`echo $2 | cut -c1`" != "-" ]; do
REQUIRES_DEVEL="$REQUIRES_DEVEL $2"
shift
done
;;
-Y)
while [ "`echo $2 | cut -c1`" != "-" ]; do
CONFLICTS_DEVEL="$CONFLICTS_DEVEL $2"
shift
done
;;
-P)
PROJECT="$2"
shift;;
@ -81,6 +93,7 @@ if [ -z "$NAME" ]; then
fi
REQUIRES="$REQUIRES_RUN $REQUIRES_DEVEL"
CONFLICTS="$CONFLICTS_RUN $CONFLICTS_DEVEL"
#if [ -n "$REQUIRES" ]; then
# REQUIRES_RUN=`echo $REQUIRES |
# sed -e '
@ -96,6 +109,7 @@ REQUIRES="$REQUIRES_RUN $REQUIRES_DEVEL"
export \
REQUIRES REQUIRES_RUN REQUIRES_DEVEL \
CONFLICTS CONFLICTS_RUN CONFLICTS_DEVEL \
TOPDIR \
PROJECT NAME \
SOURCE \