Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
ffbs-gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ffbs
ffbs-gluon
Commits
63059c7e
Commit
63059c7e
authored
9 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
Switch to new reduced gluon package module
parent
216c9ce3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+3
-2
3 additions, 2 deletions
Makefile
modules
+1
-1
1 addition, 1 deletion
modules
scripts/check_site.sh
+1
-1
1 addition, 1 deletion
scripts/check_site.sh
scripts/site.sh
+1
-1
1 addition, 1 deletion
scripts/site.sh
with
6 additions
and
5 deletions
Makefile
+
3
−
2
View file @
63059c7e
...
...
@@ -200,7 +200,8 @@ feeds: FORCE
rm
-rf
$(
TOPDIR
)
/package/feeds
mkdir
$(
TOPDIR
)
/package/feeds
[
!
-f
$(
GLUON_SITEDIR
)
/modules
]
||
.
$(
GLUON_SITEDIR
)
/modules
&&
for
feed
in
$$
GLUON_SITE_FEEDS
;
do
ln
-s
../../../packages/
$$
feed
$(
TOPDIR
)
/package/feeds/
$$
feed
;
done
.
$(
GLUONDIR
)
/modules
&&
for
feed
in
$$
GLUON_FEEDS
;
do
ln
-s
../../../packages/
$$
feed
$(
TOPDIR
)
/package/feeds/
$$
feed
;
done
ln
-s
../../../package
$(
TOPDIR
)
/package/feeds/gluon
.
$(
GLUONDIR
)
/modules
&&
for
feed
in
$$
GLUON_FEEDS
;
do
ln
-s
../../../packages/
$$
feed
$(
TOPDIR
)
/package/feeds/module_
$$
feed
;
done
+
$(
GLUONMAKE_EARLY
)
prepare-tmpinfo
config
:
FORCE
...
...
@@ -284,7 +285,7 @@ prepare-image: FORCE
+
$(
SUBMAKE
)
-C
$(
TOPDIR
)
/target/linux/
$(
BOARD
)
/image
-f
$(
GLUONDIR
)
/include/Makefile.image prepare
KDIR
=
"
$(
BOARD_KDIR
)
"
prepare
:
FORCE
@$(
STAGING_DIR_HOST
)
/bin/lua
$(
GLUONDIR
)
/package
s/gluon/gluon
/gluon-core/files/usr/lib/lua/gluon/site_config.lua
\
@$(
STAGING_DIR_HOST
)
/bin/lua
$(
GLUONDIR
)
/package/gluon-core/files/usr/lib/lua/gluon/site_config.lua
\
||
(
echo
'Your site configuration did not pass validation.'
;
false
)
mkdir
-p
$(GLUON_IMAGEDIR)
$(BOARD_BUILDDIR)
...
...
This diff is collapsed.
Click to expand it.
modules
+
1
−
1
View file @
63059c7e
...
...
@@ -8,7 +8,7 @@ PACKAGES_OPENWRT_COMMIT=01fcd1f29174a56d6ddb59901ed8c67ea42c3a8f
PACKAGES_OPENWRT_BRANCH=for-14.07
PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=
6f4e75c6405ac028ddac17e80d3b09cdefae3391
PACKAGES_GLUON_COMMIT=
db5699bede2e1223624a0d87c9ae91219b08572d
PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
PACKAGES_ROUTING_COMMIT=5d4ad63897b435d5df0f39a49bd58962c22c33b8
...
...
This diff is collapsed.
Click to expand it.
scripts/check_site.sh
+
1
−
1
View file @
63059c7e
#!/bin/sh
SITE_CONFIG_LUA
=
package
s/gluon/gluon
/gluon-core/files/usr/lib/lua/gluon/site_config.lua
SITE_CONFIG_LUA
=
package/gluon-core/files/usr/lib/lua/gluon/site_config.lua
CHECK_SITE_LIB
=
scripts/check_site_lib.lua
"
$GLUONDIR
"
/openwrt/staging_dir/host/bin/lua
-e
"site = dofile(os.getenv('GLUONDIR') .. '/
${
SITE_CONFIG_LUA
}
'); dofile(os.getenv('GLUONDIR') .. '/
${
CHECK_SITE_LIB
}
'); dofile()"
This diff is collapsed.
Click to expand it.
scripts/site.sh
+
1
−
1
View file @
63059c7e
#!/bin/sh
SITE_CONFIG_LUA
=
package
s/gluon/gluon
/gluon-core/files/usr/lib/lua/gluon/site_config.lua
SITE_CONFIG_LUA
=
package/gluon-core/files/usr/lib/lua/gluon/site_config.lua
"
$GLUONDIR
"
/openwrt/staging_dir/host/bin/lua
-e
"print(assert(dofile(os.getenv('GLUONDIR') .. '/
${
SITE_CONFIG_LUA
}
').
$1
))"
2>/dev/null
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