Skip to content

Commit

Permalink
imagebuilder: Fix sorting package list breaks opkg dependency handlin…
Browse files Browse the repository at this point in the history
…g for provides

When imagebuild sorts package lists it breaks opkg's ability to realize
that a providers for a Provides has already been installed, when the sort
results in the provider being later in the list of packages that a package
which depends on a Provides (and hence the provider is not yet installed
for opkg to realize the provider was available doesn't not handle the case
of a package that is to be installed satisfying a dependency, only one that
is already installed (or which it schedules to be installed, which in the
absence of an installed provider is whichever provider happens to be the
default)

Signed-off-by: Daniel Dickinson <[email protected]>
  • Loading branch information
Daniel Dickinson authored and jow- committed May 18, 2016
1 parent d830cb0 commit 9fd8e55
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion target/imagebuilder/files/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ _call_info: FORCE
echo 'Available Profiles:'
echo; $(PROFILE_LIST)

BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
BUILD_PACKAGES:=$(USER_PACKAGES) $(sort $(DEFAULT_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
# "-pkgname" in the package list means remove "pkgname" from the package list
BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
PACKAGES:=
Expand Down

0 comments on commit 9fd8e55

Please sign in to comment.