Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon
Commits
1c1fbe38
Commit
1c1fbe38
authored
10 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
Always ignore profile-specific packages supplied by OpenWrt
parent
d2d8f6d5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+2
-3
2 additions, 3 deletions
Makefile
include/gluon.mk
+1
-1
1 addition, 1 deletion
include/gluon.mk
with
3 additions
and
4 deletions
Makefile
+
2
−
3
View file @
1c1fbe38
...
@@ -121,12 +121,11 @@ PROFILE_PACKAGES :=
...
@@ -121,12 +121,11 @@ PROFILE_PACKAGES :=
define
Profile
define
Profile
$(
eval
$(
call Profile/Default
))
$(
eval
$(
call Profile/Default
))
$(
eval
$(
call Profile/
$(
1
)))
$(
eval
$(
call Profile/
$(
1
)))
$(1)_PACKAGES
:=
$(
PACKAGES
)
endef
endef
define
GluonProfile
define
GluonProfile
PROFILES
+=
$(
1
)
PROFILES
+=
$(
1
)
PROFILE_PACKAGES
+=
$(
filter-out -%,
$($(
1
)
_PACKAGES
)
$(
2
)
$(
GLUON_
$(
1
)
_SITE_PACKAGES
))
PROFILE_PACKAGES
+=
$(
filter-out -%,
$(
2
)
$(
GLUON_
$(
1
)
_SITE_PACKAGES
))
GLUON_$(1)_DEFAULT_PACKAGES
:=
$(
2
)
GLUON_$(1)_DEFAULT_PACKAGES
:=
$(
2
)
GLUON_$(1)_MODELS
:=
GLUON_$(1)_MODELS
:=
endef
endef
...
@@ -303,7 +302,7 @@ enable_initscripts: FORCE
...
@@ -303,7 +302,7 @@ enable_initscripts: FORCE
# Generate package list
# Generate package list
$(
eval
$(
call merge-lists,INSTALL_PACKAGES,DEFAULT_PACKAGES
$(
PROFILE
)
_PACKAGES
GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKAGES GLUON_
$(
PROFILE
)
_DEFAULT_PACKAGES GLUON_
$(
PROFILE
)
_SITE_PACKAGES
))
$(
eval
$(
call merge-lists,INSTALL_PACKAGES,DEFAULT_PACKAGES GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKAGES GLUON_
$(
PROFILE
)
_DEFAULT_PACKAGES GLUON_
$(
PROFILE
)
_SITE_PACKAGES
))
package_install
:
FORCE
package_install
:
FORCE
$(
OPKG
)
update
$(
OPKG
)
update
...
...
This diff is collapsed.
Click to expand it.
include/gluon.mk
+
1
−
1
View file @
1c1fbe38
...
@@ -60,7 +60,7 @@ endef
...
@@ -60,7 +60,7 @@ endef
regex-escape
=
$(
shell
echo
'
$(
1
)
'
|
sed
-e
's/[]\/(
)
$*.^|[]/\\&/g'
)
regex-escape
=
$(
shell
echo
'
$(
1
)
'
|
sed
-e
's/[]\/(
)
$*.^|[]/\\&/g'
)
GLUON_DEFAULT_PACKAGES
:=
gluon-core kmod-ipv6 firewall ip6tables
-uboot-envtools
-kmod-usb-core
-kmod-usb2
-kmod-ledtrig-usbdev
GLUON_DEFAULT_PACKAGES
:=
gluon-core kmod-ipv6 firewall ip6tables
-uboot-envtools
override
DEFAULT_PACKAGES.router
:=
override
DEFAULT_PACKAGES.router
:=
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment