| Message ID | 20180227123924.20725-1-chrismcc@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] bind BIND_PKGDIR | expand |
Hello, On Tue, 27 Feb 2018 04:39:22 -0800, Christopher McCrory wrote: > use BIND_PKGDIR instead of package/bind > > Signed-off-by: Christopher McCrory <chrismcc@gmail.com> > --- > package/bind/bind.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) I've applied to next, after changing the commit title to follow the convention: <package>: <description> Thanks! Thomas
Hello, On Tue, 27 Feb 2018 04:39:24 -0800, Christopher McCrory wrote: > sed script to alter directory locations > > Signed-off-by: Christopher McCrory <chrismcc@gmail.com> This cannot be separated from PATCH 2/3, because PATCH 2/3 uses this sed script, so PATCH 2/3 and 3/3 should be merged together. Thanks! Thomas
diff --git a/package/bind/bind.mk b/package/bind/bind.mk index bec902079c..392ef321c2 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -93,11 +93,11 @@ endef ifeq ($(BR2_PACKAGE_BIND_SERVER),y) define BIND_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/bind/S81named \ + $(INSTALL) -m 0755 -D $(BIND_PKGDIR)/S81named \ $(TARGET_DIR)/etc/init.d/S81named endef define BIND_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/bind/named.service \ + $(INSTALL) -D -m 644 $(BIND_PKGDIR)/named.service \ $(TARGET_DIR)/usr/lib/systemd/system/named.service mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
use BIND_PKGDIR instead of package/bind Signed-off-by: Christopher McCrory <chrismcc@gmail.com> --- package/bind/bind.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)