Changeset 410

Timestamp:

Oct 6, 2012, 10:10:36 PM (10 years ago)

Author:

ehem

Message:

Add the ability to for plugins to have their own Makefile included into
DebWRT's build. Document this.

Location:

branches/contrib/plugins

Files:

• README (modified) (2 diffs)
• plugins.mk (modified) (2 diffs)

branches/contrib/plugins/README

@@ -3 +3 @@
 Layout:
 
-  plugins/<plugin-name/        - plugin directory
-  plugins/<plugin-name/debwrt  - debwrt patches
-  plugins/<plugin-name/openwrt - openwrt patches
-  plugins/<plugin-name/README  - information about the plugin
+  plugins/<plugin-name>/           - plugin directory
+  plugins/<plugin-name>/README     - information about the plugin
+  plugins/<plugin-name>/plugin.mk  - included as a Makefile by plugins.mk
+  plugins/<plugin-name>/debwrt     - debwrt patches
+  plugins/<plugin-name>/openwrt    - openwrt patches
 
 All plugins are enabled by default and all patches part of the plugin will be
@@ -15 +16 @@
 make (menu)config. OpenWrt patches are automatically applied in sort order 
 after OpenWrt has been checked out.
+
+plugin.mk is included by the plugins.mk Makefile.  The suggested usage is to
+add a plugin's target as a prerequisite of an existing DebWrt target.  The
+plugin's target will then be invoked before that DebWrt target.
 
 Make targets to manage plugings. Normally only needed when developing a plugin. Targets:

branches/contrib/plugins/plugins.mk

@@ -2 +2 @@
 #
 # Copyright (C) 2011 Johan van Zoomeren <amain@debwrt.net>
+#
+# Copyright (C) 2012 Elliott Mitchell <ehem+debwrt@m5p.com>
+#       2012-10-06  merged OpenWRT patching with DebWRT's patching of OpenWRT
+#       2012-10-06  added ability to include Makefile from plugins
 #
 # This program is free software: you can redistribute it and/or modify
@@ -21 +25 @@
         PLUGIN_LIST:=$(PLUGIN)
 endif
+
+-include $(addprefix plugins/,$(addsuffix /plugin.mk,$(PLUGIN_LIST)))
+
+##need to resolve the -p0 vs -p1 issue first
+## # add the plugin patches to the list of patches to OpenWRT
+## OPENWRT_PATCH_DIRS += $(wildcard $(addprefix $(TOPDIR)/plugins/,$(addsuffix /openwrt,$(PLUGIN_LIST))))
+
+
 
 plugins/apply: plugins/apply-debwrt