mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
3d851fe4ce
This was originally from OE-Classic. Improvements over the OE-Classic recipe for reference: * Update to 1.3.4b * Add workaround for proftpd host IP resolution * Add initscript, borrowed from Debian with some modifications for compatibility and handling for hardcoded paths * Use autotools.bbclass and remove unnecessary configure options * PARALLEL_MAKE = "" is no longer needed, the bug was fixed in 1.3.3c * Set SUMMARY (which sets DESCRIPTION) and base it on the short description from the website * Use useradd.bbclass to add ftp user/group * Add HOMEPAGE * Add/fix description in some patches and improve recipe indentation * Make LICENSE more accurate * Add LIC_FILES_CHKSUM Some of this work was done by Dexuan Cui <dexuan.cui@intel.com> and Kevin Strasser <kevin.strasser@linux.intel.com>. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
The contrib directory now contains its own Makefile which is
|
|
used during installation. It was required to pass DESTDIR through
|
|
when it gets called from the base Makefile.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
|
|
---
|
|
Makefile.in | 2 +-
|
|
contrib/Makefile.in | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 5b2e683..ee72fe1 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir)
|
|
test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install)
|
|
|
|
install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
|
|
- cd contrib/ && $(MAKE) install-utils
|
|
+ cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils
|
|
$(INSTALL_BIN) ftpcount $(DESTDIR)$(bindir)/ftpcount
|
|
$(INSTALL_BIN) ftpdctl $(DESTDIR)$(bindir)/ftpdctl
|
|
$(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub
|
|
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
|
|
index 5bcc038..51d248c 100644
|
|
--- a/contrib/Makefile.in
|
|
+++ b/contrib/Makefile.in
|
|
@@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status
|
|
cd ../ && ./config.status
|
|
|
|
install-utils:
|
|
- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd
|
|
- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
|
|
- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota
|
|
+ $(INSTALL) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd
|
|
+ $(INSTALL) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
|
|
+ $(INSTALL) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota
|
|
--
|
|
1.7.9.5
|
|
|