Message ID | 1458023493-29584-7-git-send-email-tim@tn-x.org |
---|---|
State | Superseded, archived |
Headers | show |
diff --git a/src/packages/fff/fff-fastd/Makefile b/src/packages/fff/fff-fastd/Makefile index 26565e1..04c378a 100644 --- a/src/packages/fff/fff-fastd/Makefile +++ b/src/packages/fff/fff-fastd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-fastd PKG_VERSION:=1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-fastd @@ -18,7 +18,8 @@ define Package/fff-fastd +@FASTD_ENABLE_METHOD_NULL \ +@FASTD_ENABLE_CIPHER_NULL \ +@FASTD_WITH_STATUS_SOCKET \ - +fastd + +fastd \ + +fff-random endef define Package/fff-batman-adv-legacy/description diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile index 8ff1891..2d0e54a 100644 --- a/src/packages/fff/fff-nodewatcher/Makefile +++ b/src/packages/fff/fff-nodewatcher/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-nodewatcher PKG_VERSION:=36 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher @@ -13,7 +13,7 @@ define Package/fff-nodewatcher CATEGORY:=Freifunk TITLE:= Freifunk-Franken Nodewatcher URL:=http://www.freifunk-franken.de - DEPENDS:=+alfred +micrond + DEPENDS:=+alfred +micrond +fff-random endef define Package/fff-nodewatcher/description diff --git a/src/packages/fff/fff-random/Makefile b/src/packages/fff/fff-random/Makefile new file mode 100644 index 0000000..cd0228b --- /dev/null +++ b/src/packages/fff/fff-random/Makefile @@ -0,0 +1,40 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=fff-random +PKG_VERSION:=0.0.1 +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-random + +include $(INCLUDE_DIR)/package.mk + +define Package/fff-random + SECTION:=base + CATEGORY:=Freifunk + TITLE:=Freifunk-Franken Random + URL:=http://www.freifunk-franken.de + DEPENDS:=+@BUSYBOX_CONFIG_ASH +endef + +define Package/fff-base/description + This is the Freifunk Franken Firmware Random package + This packages provides a random function. +endef + +define Build/Prepare + echo "all: " > $(PKG_BUILD_DIR)/Makefile +endef + +define Build/Configure + # nothing +endef + +define Build/Compile + # nothing +endef + +define Package/fff-random/install + $(CP) ./files/* $(1)/ +endef + +$(eval $(call BuildPackage,fff-random)) diff --git a/src/packages/fff/fff/files/usr/bin/random b/src/packages/fff/fff-random/files/usr/bin/random similarity index 100% rename from src/packages/fff/fff/files/usr/bin/random rename to src/packages/fff/fff-random/files/usr/bin/random diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile index b7473dc..e709987 100644 --- a/src/packages/fff/fff/Makefile +++ b/src/packages/fff/fff/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff -PKG_VERSION:=0.0.1 -PKG_RELEASE:=6 +PKG_VERSION:=0.0.2 +PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/fff @@ -40,7 +40,7 @@ define Build/Compile endef define Package/fff-base/install - $(CP) ./files/* $(1)/ + # nothing endef $(eval $(call BuildPackage,fff-base))
Hey, Kommentare sind inline. On Dienstag, 15. März 2016 07:31:30 CET Tim Niemeyer wrote: > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > --- > > src/packages/fff/fff-fastd/Makefile | 5 +-- > src/packages/fff/fff-nodewatcher/Makefile | 4 +-- > src/packages/fff/fff-random/Makefile | 40 > ++++++++++++++++++++++ .../fff/{fff => fff-random}/files/usr/bin/random | > 0 > src/packages/fff/fff/Makefile | 6 ++-- > 5 files changed, 48 insertions(+), 7 deletions(-) > create mode 100644 src/packages/fff/fff-random/Makefile > rename src/packages/fff/{fff => fff-random}/files/usr/bin/random (100%) > > diff --git a/src/packages/fff/fff-fastd/Makefile > b/src/packages/fff/fff-fastd/Makefile index 26565e1..04c378a 100644 > --- a/src/packages/fff/fff-fastd/Makefile > +++ b/src/packages/fff/fff-fastd/Makefile > @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-fastd > PKG_VERSION:=1 > -PKG_RELEASE:=1 > +PKG_RELEASE:=2 > > PKG_BUILD_DIR:=$(BUILD_DIR)/fff-fastd > > @@ -18,7 +18,8 @@ define Package/fff-fastd > +@FASTD_ENABLE_METHOD_NULL \ > +@FASTD_ENABLE_CIPHER_NULL \ > +@FASTD_WITH_STATUS_SOCKET \ > - +fastd > + +fastd \ > + +fff-random > endef > > define Package/fff-batman-adv-legacy/description > diff --git a/src/packages/fff/fff-nodewatcher/Makefile > b/src/packages/fff/fff-nodewatcher/Makefile index 8ff1891..2d0e54a 100644 > --- a/src/packages/fff/fff-nodewatcher/Makefile > +++ b/src/packages/fff/fff-nodewatcher/Makefile > @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-nodewatcher > PKG_VERSION:=36 > -PKG_RELEASE:=1 > +PKG_RELEASE:=2 > > PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher > > @@ -13,7 +13,7 @@ define Package/fff-nodewatcher > CATEGORY:=Freifunk > TITLE:= Freifunk-Franken Nodewatcher > URL:=http://www.freifunk-franken.de > - DEPENDS:=+alfred +micrond > + DEPENDS:=+alfred +micrond +fff-random > endef > > define Package/fff-nodewatcher/description > diff --git a/src/packages/fff/fff-random/Makefile > b/src/packages/fff/fff-random/Makefile new file mode 100644 > index 0000000..cd0228b > --- /dev/null > +++ b/src/packages/fff/fff-random/Makefile > @@ -0,0 +1,40 @@ > +include $(TOPDIR)/rules.mk > + > +PKG_NAME:=fff-random > +PKG_VERSION:=0.0.1 > +PKG_RELEASE:=1 > + > +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-random > + > +include $(INCLUDE_DIR)/package.mk > + > +define Package/fff-random > + SECTION:=base > + CATEGORY:=Freifunk > + TITLE:=Freifunk-Franken Random > + URL:=http://www.freifunk-franken.de > + DEPENDS:=+@BUSYBOX_CONFIG_ASH > +endef > + > +define Package/fff-base/description Da ist noch ein Überbleibsel von fff-base übrig, oder? > + This is the Freifunk Franken Firmware Random package > + This packages provides a random function. Hier passt die Einrückung nicht hundertprozentig. > +endef > + > +define Build/Prepare > + echo "all: " > $(PKG_BUILD_DIR)/Makefile > +endef > + > +define Build/Configure > + # nothing > +endef > + > +define Build/Compile > + # nothing > +endef > + > +define Package/fff-random/install > + $(CP) ./files/* $(1)/ > +endef > + > +$(eval $(call BuildPackage,fff-random)) > diff --git a/src/packages/fff/fff/files/usr/bin/random > b/src/packages/fff/fff-random/files/usr/bin/random similarity index 100% > rename from src/packages/fff/fff/files/usr/bin/random > rename to src/packages/fff/fff-random/files/usr/bin/random > diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile > index b7473dc..e709987 100644 > --- a/src/packages/fff/fff/Makefile > +++ b/src/packages/fff/fff/Makefile > @@ -1,8 +1,8 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff > -PKG_VERSION:=0.0.1 > -PKG_RELEASE:=6 > +PKG_VERSION:=0.0.2 > +PKG_RELEASE:=1 > > PKG_BUILD_DIR:=$(BUILD_DIR)/fff > > @@ -40,7 +40,7 @@ define Build/Compile > endef > > define Package/fff-base/install > - $(CP) ./files/* $(1)/ > + # nothing > endef > > $(eval $(call BuildPackage,fff-base))
Signed-off-by: Tim Niemeyer <tim@tn-x.org> --- src/packages/fff/fff-fastd/Makefile | 5 +-- src/packages/fff/fff-nodewatcher/Makefile | 4 +-- src/packages/fff/fff-random/Makefile | 40 ++++++++++++++++++++++ .../fff/{fff => fff-random}/files/usr/bin/random | 0 src/packages/fff/fff/Makefile | 6 ++-- 5 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 src/packages/fff/fff-random/Makefile rename src/packages/fff/{fff => fff-random}/files/usr/bin/random (100%)