Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
atools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Leo
atools
Commits
7326f29a
Commit
7326f29a
authored
May 25, 2019
by
Leo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace makedepend-in-depends with a more expensive and better version.
parent
5d858229
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
11 deletions
+26
-11
alint.5.scd
alint.5.scd
+6
-4
aports-lint
aports-lint
+20
-7
No files found.
alint.5.scd
View file @
7326f29a
...
...
@@ -82,11 +82,13 @@ Declaring duplicate dependencies is superfluous.
The
pkgname
variable
of
the
APKBUILD
has
value
*
foo
*
but
the
directory
in
which
the
APKBUILD
is
found
is
not
named
*
foo
*
##
makedepend
-
in
-
depends
##
depends
-
makedepends
-
checkdepends
-
overlap
A
package
is
present
in
both
makedepends
and
depends
which
is
superfluous
since
all
depends
are
installed
alongside
the
makedepends
,
the
package
can
be
removed
from
makedepends
A
package
is
present
in
2
to
3
of
the
3
types
of
following
dependencies:
depends
,
makedepends
and
checkdepends
.
All
of
them
are
installed
during
creation
of
the
package
,
please
specify
only
once
in
the
lowest
common
denominator
location
.
##
checkdepend
-
in
-
depends
#
TAGS
(
apkbuild
-
lint
)
...
...
aports-lint
View file @
7326f29a
...
...
@@ -136,14 +136,30 @@ pkgname_dirname_mismatch() {
fi
}
makedepend_in_depends
()
{
[
"
$SKIP_
MAKEDEPEND_IN_DEPENDS
"
]
&&
return
0
local
_mkdeps
depends_makedepends_checkdepends_overlap
()
{
[
"
$SKIP_
DEPENDS_MAKEDEPENDS_CHECKDEPENDS_OVERLAP
"
]
&&
return
0
local
_mkdeps
_ckdeps d
_mkdeps
=
"
$(
echo
$makedepends
|
tr
" "
"
\\
n"
|
sort
-u
)
"
_ckdeps
=
"
$(
echo
$checkdepends
|
tr
" "
"
\\
n"
|
sort
-u
)
"
[
-z
"
$_mkdeps
"
]
&&
[
-z
"
$_ckdeps
"
]
&&
return
0
for
d
in
$depends
;
do
if
printf
"%s
\\
n"
"
$_mkdeps
"
|
grep
-q
"^
$d
$"
;
then
printf
"%s:: dependency '%s' is in depends and makedepends
\n
"
"
$apkbuild
"
"
$d
"
fi
# Don't check against checkdepends if it is empty
[
-z
"
$checkdepends
"
]
&&
continue
if
printf
"%s
\\
n"
"
$_ckdeps
"
|
grep
-q
"^
$d
$"
;
then
printf
"%s:: dependency '%s' is in depends and checkdepends
\n
"
"
$apkbuild
"
"
$d
"
fi
done
# Don't check against checkdepends if it is empty
[
-z
"
$checkdepends
"
]
&&
return
0
for
d
in
$makedepends
;
do
if
printf
"%s
\\
n"
"
$_ckdeps
"
|
grep
-q
"^
$d
$"
;
then
printf
"%s:: dependency '%s' is in makedepends and checkdepends
\n
"
"
$apkbuild
"
"
$d
"
fi
done
}
...
...
@@ -176,10 +192,7 @@ for apkbuild; do
if
[
!
-z
"
$makedepends
"
]
;
then
upper_repo_makedepends &
duplicate_makedepends &
fi
if
[
"
$makedepends
"
]
&&
[
"
$depends
"
]
;
then
makedepend_in_depends &
depends_makedepends_checkdepends_overlap &
fi
if
[
!
-z
"
$checkdepends
"
]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment