summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rules/apache2.make10
-rw-r--r--rules/host-ipkg.in6
-rw-r--r--rules/ipkg.make2
-rw-r--r--rules/ntp.make2
-rw-r--r--rules/other/Toplevel.make2
-rw-r--r--rules/proftpd.make16
-rw-r--r--rules/pureftpd.make2
-rw-r--r--rules/rootfs.in14
-rw-r--r--rules/rootfs.make56
-rw-r--r--rules/rsync.in4
-rw-r--r--rules/rsync.make4
-rw-r--r--rules/syslogng.make2
-rw-r--r--rules/thttpd.make4
-rw-r--r--rules/udev.make4
-rw-r--r--rules/utelnetd.make12
15 files changed, 70 insertions, 70 deletions
diff --git a/rules/apache2.make b/rules/apache2.make
index cbdb934d1..b020d1d8a 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -2,7 +2,7 @@
# $Id: apache2.make,v 1.10 2006/10/02 08:38:47 michl Exp $
#
# Copyright (C) 2005 by Robert Schwebel
-#
+#
# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
@@ -99,7 +99,7 @@ $(STATEDIR)/apache2.prepare: $(apache2_prepare_deps_default)
#
# Tweak, Tweak ...
#
- # The original object files are also used for other binaries, so
+ # The original object files are also used for other binaries, so
# we generate a dummy dependency here
#
perl -i -p -e "s/^gen_test_char_OBJECTS =.*$$/gen_test_char_OBJECTS = dummy.lo/g" $(APACHE2_DIR)/server/Makefile
@@ -238,7 +238,7 @@ ifneq ($(PTXCONF_APACHE2_DOCUMENTROOT),"")
@$(call install_copy, apache2, 12, 102, 0755, $(PTXCONF_APACHE2_DOCUMENTROOT))
ifdef PTXCONF_APACHE2_DEFAULT_INDEX
@$(call install_copy, apache2, 12, 102, 0644, \
- $(PTXDIST_TOPDIR)/projects-example/generic/index.html, \
+ $(PTXDIST_TOPDIR)/generic/index.html, \
$(PTXCONF_APACHE2_DOCUMENTROOT)/index.html,n)
endif
endif
@@ -251,7 +251,7 @@ ifneq ($(PTXCONF_APACHE2_CONFIGDIR),"")
#
ifdef PTXCONF_APACHE2_DEFAULTCONFIG
@$(call install_copy, apache2, 12, 102, 0644, \
- $(PTXDIST_TOPDIR)/projects-example/generic/httpd.conf, \
+ $(PTXDIST_TOPDIR)/generic/httpd.conf, \
$(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, n)
@echo "installing apache's default config file..."
# modify placeholders with data from configuration
@@ -301,7 +301,7 @@ ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_HTTPD_USER_FILE)),)
else
# generic script with path modifications
@$(call install_copy, apache2, 0, 0, 0755, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/httpd, \
+ $(PTXDIST_TOPDIR)/generic/etc/init.d/httpd, \
/etc/init.d/httpd, n)
@$(call install_replace, apache2, /etc/init.d/httpd, \
@APACHECONFIG@, $(PTXCONF_APACHE2_CONFIGDIR) )
diff --git a/rules/host-ipkg.in b/rules/host-ipkg.in
index fd7f89006..4146c4ca1 100644
--- a/rules/host-ipkg.in
+++ b/rules/host-ipkg.in
@@ -3,8 +3,8 @@ config HOST_IPKG
default y
# no prompt, policy is that we always need it
help
- ipkg is used on the development host to install packets into
- some directory. Example:
+ ipkg is used on the development host to install packets into
+ some directory. Example:
- ipkg-cl -o . --force-depends -f ../projects-example/generic/etc/ipkg.conf install foo.ipk
+ ipkg-cl -o . --force-depends -f ../generic/etc/ipkg.conf install foo.ipk
diff --git a/rules/ipkg.make b/rules/ipkg.make
index ce1303228..ffca9c042 100644
--- a/rules/ipkg.make
+++ b/rules/ipkg.make
@@ -121,7 +121,7 @@ $(STATEDIR)/ipkg.targetinstall: $(ipkg_targetinstall_deps_default)
ifdef PTXCONF_IPKG_LOG_WRAPPER
@$(call install_copy, ipkg, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg-cl)
@$(call install_copy, ipkg, 0, 0, 0755, \
- $(PTXDIST_TOPDIR)/projects-example/generic/bin/ipkg_log_wrapper, \
+ $(PTXDIST_TOPDIR)/generic/bin/ipkg_log_wrapper, \
/usr/bin/ipkg, n)
else
@$(call install_copy, ipkg, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg)
diff --git a/rules/ntp.make b/rules/ntp.make
index 348368ce5..d9aad84fe 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -361,7 +361,7 @@ ifdef PTXCONF_NTP_NTPDATE
endif
ifdef PTXCONF_NTP_NTPD
@$(call install_copy, ntp, 0, 0, 0755, $(NTP_DIR)/ntpd/ntpd, /usr/sbin/ntpd)
- @$(call install_copy, ntp, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/ntp, /etc/init.d/ntp-server, n)
+ @$(call install_copy, ntp, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/ntp, /etc/init.d/ntp-server, n)
endif
ifdef PTXCONF_NTP_NTPDC
@$(call install_copy, ntp, 0, 0, 0755, $(NTP_DIR)/ntpdc/ntpdc, /usr/sbin/ntpdc)
diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make
index 0dadc334e..6380e648f 100644
--- a/rules/other/Toplevel.make
+++ b/rules/other/Toplevel.make
@@ -249,7 +249,7 @@ ifdef PTXCONF_IMAGE_TGZ
endif
ifdef PTXCONF_IMAGE_JFFS2
@imagesfrom=$(IMAGEDIR); \
- cp $(PTXDIST_TOPDIR)/projects-example/generic/etc/ipkg.conf $(IMAGEDIR)/ipkg.conf; \
+ cp $(PTXDIST_TOPDIR)/generic/etc/ipkg.conf $(IMAGEDIR)/ipkg.conf; \
sed -i -e "s,@SRC@,,g" $(IMAGEDIR)/ipkg.conf; \
sed -i -e "s,@ARCH@,$(PTXCONF_ARCH),g" $(IMAGEDIR)/ipkg.conf; \
echo "Creating rootfs using packages from $$imagesfrom"; \
diff --git a/rules/proftpd.make b/rules/proftpd.make
index e69fd2893..095eaddcc 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -3,7 +3,7 @@
#
# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
#
-# See CREDITS for details about who has contributed to this project.
+# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
# see the README file.
@@ -15,7 +15,7 @@
PACKAGES-$(PTXCONF_PROFTPD) += proftpd
#
-# Paths and names
+# Paths and names
#
PROFTPD_VERSION = 1.3.0rc1
PROFTPD = proftpd-$(PROFTPD_VERSION)
@@ -142,14 +142,14 @@ $(STATEDIR)/proftpd.targetinstall: $(proftpd_targetinstall_deps_default)
$(PROFTPD_DIR)/proftpd, \
/usr/sbin/proftpd)
@$(call install_copy, proftpd, 0, 0, 0755, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/proftpd, \
+ $(PTXDIST_TOPDIR)/generic/etc/init.d/proftpd, \
/etc/init.d/proftpd, n)
-
-ifdef $(PTXCONF_PROFTPD_DEFAULTCONFIG)
+
+ifdef $(PTXCONF_PROFTPD_DEFAULTCONFIG)
@$(call install_copy, proftpd, 11, 101, 0644, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/proftpd.conf, \
+ $(PTXDIST_TOPDIR)/generic/etc/proftpd.conf, \
/etc/proftpd.conf, n)
-endif
+endif
@$(call install_finish, proftpd)
@@ -159,7 +159,7 @@ endif
# Clean
# ----------------------------------------------------------------------------
-proftpd_clean:
+proftpd_clean:
rm -rf $(STATEDIR)/proftpd.* $(PROFTPD_DIR)
rm -rf $(IMAGEDIR)/proftpd_*
diff --git a/rules/pureftpd.make b/rules/pureftpd.make
index 72074c873..7cc024aac 100644
--- a/rules/pureftpd.make
+++ b/rules/pureftpd.make
@@ -160,7 +160,7 @@ ifdef PTXCONF_ROOTFS_ETC_INITD_PUREFTPD
ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_USER_FILE)),)
@$(call install_copy, pureftpd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_USER_FILE), /etc/init.d/pure-ftpd, n)
else
- @$(call install_copy, pureftpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/pure-ftpd, /etc/init.d/pure-ftpd, n)
+ @$(call install_copy, pureftpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/pure-ftpd, /etc/init.d/pure-ftpd, n)
endif
endif
diff --git a/rules/rootfs.in b/rules/rootfs.in
index 9b2179fe4..1e5b5947f 100644
--- a/rules/rootfs.in
+++ b/rules/rootfs.in
@@ -398,7 +398,7 @@ config ROOTFS_ETC_INITD
select BB_CONFIG_RUN_PARTS if BUSYBOX
help
When enabled, this option copies the files from
- ${PTXDIST_TOPDIR}/projects-example/generic/etc/init.d to the target root
+ ${PTXDIST_TOPDIR}/generic/etc/init.d to the target root
filesystem. The files contain useful defaults for most projects,
so if you don't intend to use your completely self-made etc
directory you should problably switch this on.
@@ -538,7 +538,7 @@ menuconfig ROOTFS_ETC_INITD_TELNETD
bool
prompt "Use default telnetd"
help
- A file from projects-example/generic/etc/init.d/telnetd will be used
+ A file from generic/etc/init.d/telnetd will be used
config ROOTFS_ETC_INITD_TELNETD_USER
depends on ROOTFS_ETC_INITD_TELNETD
@@ -639,7 +639,7 @@ menuconfig ROOTFS_ETC_INITD_HTTPD
bool
prompt "Use default httpd"
help
- A file from projects-example/generic/etc/init.d/httpd will be used.
+ A file from generic/etc/init.d/httpd will be used.
config ROOTFS_ETC_INITD_HTTPD_USER
bool
@@ -689,7 +689,7 @@ menuconfig ROOTFS_ETC_INITD_DROPBEAR
bool
prompt "Use default dropbear"
help
- A file from projects-example/generic/etc/init.d/dropbear will be used.
+ A file from generic/etc/init.d/dropbear will be used.
config ROOTFS_ETC_INITD_DROPBEAR_USER
bool
@@ -742,7 +742,7 @@ menuconfig ROOTFS_ETC_INITD_UDEV
prompt "Use default udevd"
select UDEV_START
help
- A file from projects-example/generic/etc/init.d/udev will be used
+ A file from generic/etc/init.d/udev will be used
config ROOTFS_ETC_INITD_UDEV_USER
depends on ROOTFS_ETC_INITD && ROOTFS_ETC_INITD_UDEV
@@ -794,7 +794,7 @@ menuconfig ROOTFS_ETC_INITD_PUREFTPD
bool
prompt "Use default pure-ftpd"
help
- A file from projects-example/generic/etc/init.d/pure-ftpd will be used.
+ A file from generic/etc/init.d/pure-ftpd will be used.
config ROOTFS_ETC_INITD_PUREFTPD_USER
bool
@@ -844,7 +844,7 @@ menuconfig ROOTFS_ETC_INITD_THTTPD
bool
prompt "Use default thttpd script"
help
- The file from projects-example/generic/etc/init.d/thttpd will be used.
+ The file from generic/etc/init.d/thttpd will be used.
config ROOTFS_ETC_INITD_THTTPD_USER
bool
diff --git a/rules/rootfs.make b/rules/rootfs.make
index ae3526d43..bbd561687 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -165,7 +165,7 @@ endif
#
ifdef PTXCONF_ROOTFS_GENERIC_FSTAB
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/fstab, /etc/fstab, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/fstab, /etc/fstab, n)
endif
ifdef PTXCONF_ROOTFS_GENERIC_MTAB
@@ -173,35 +173,35 @@ ifdef PTXCONF_ROOTFS_GENERIC_MTAB
endif
ifdef PTXCONF_ROOTFS_GENERIC_GROUP
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/group, /etc/group, n)
- @$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects-example/generic/etc/gshadow, /etc/gshadow, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/group, /etc/group, n)
+ @$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/generic/etc/gshadow, /etc/gshadow, n)
endif
ifdef PTXCONF_ROOTFS_GENERIC_HOSTNAME
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/hostname, /etc/hostname, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/hostname, /etc/hostname, n)
@$(call install_replace, rootfs, /etc/hostname, @HOSTNAME@, $(call remove_quotes,$(PTXCONF_ROOTFS_ETC_HOSTNAME)))
endif
ifdef PTXCONF_ROOTFS_GENERIC_HOSTS
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/hosts, /etc/hosts, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/hosts, /etc/hosts, n)
endif
ifdef PTXCONF_ROOTFS_GENERIC_INITTAB
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/inittab, /etc/inittab, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/inittab, /etc/inittab, n)
@$(call install_replace, rootfs, /etc/inittab, @CONSOLE@, $(call remove_quotes,$(PTXCONF_ROOTFS_ETC_CONSOLE)))
@$(call install_replace, rootfs, /etc/inittab, @SPEED@, $(call remove_quotes,$(PTXCONF_ROOTFS_ETC_CONSOLE_SPEED)))
endif
ifdef PTXCONF_ROOTFS_GENERIC_IPKG_CONF
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/ipkg.conf, /etc/ipkg.conf, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/ipkg.conf, /etc/ipkg.conf, n)
@$(call install_replace, rootfs, /etc/ipkg.conf, @SRC@, $(PTXCONF_ROOTFS_GENERIC_IPKG_CONF_URL))
@$(call install_replace, rootfs, /etc/ipkg.conf, @ARCH@, $(PTXCONF_ARCH))
endif
ifdef PTXCONF_ROOTFS_GENERIC_NSSWITCH
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/nsswitch.conf,/etc/nsswitch.conf, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/nsswitch.conf,/etc/nsswitch.conf, n)
endif
ifdef PTXCONF_ROOTFS_GENERIC_PASSWD
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/passwd, /etc/passwd, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/passwd, /etc/passwd, n)
endif
ifdef PTXCONF_ROOTFS_GENERIC_PROFILE
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/profile, /etc/profile, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/profile, /etc/profile, n)
@$(call install_replace, rootfs, /etc/profile, @PS1@, \"$(PTXCONF_ROOTFS_ETC_PS1)\" )
@$(call install_replace, rootfs, /etc/profile, @PS2@, \"$(PTXCONF_ROOTFS_ETC_PS2)\" )
@@ -209,19 +209,19 @@ ifdef PTXCONF_ROOTFS_GENERIC_PROFILE
endif
ifdef PTXCONF_ROOTFS_GENERIC_PROTOCOLS
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/protocols, /etc/protocols, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/protocols, /etc/protocols, n)
endif
ifdef PTXCONF_ROOTFS_GENERIC_RESOLV
- @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/resolv.conf, /etc/resolv.conf, n)
+ @$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/generic/etc/resolv.conf, /etc/resolv.conf, n)
endif
###########################################################################################
ifdef PTXCONF_ROOTFS_GENERIC_INETD
# does the user wants a generic file?
$(call install_copy, rootfs, 0, 0, 0644, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/inetd.conf, \
+ $(PTXDIST_TOPDIR)/generic/etc/inetd.conf, \
/etc/inetd.conf, n )
@$(call install_copy, rootfs, 0, 0, 0644, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/services, \
+ $(PTXDIST_TOPDIR)/generic/etc/services, \
/etc/services, n )
#
# Replace all markers if service is enabled
@@ -313,11 +313,11 @@ endif
endif
ifdef PTXCONF_ROOTFS_GENERIC_SHADOW
- @$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects-example/generic/etc/shadow, /etc/shadow, n)
- @$(call install_copy, rootfs, 0, 0, 0600, $(PTXDIST_TOPDIR)/projects-example/generic/etc/shadow-, /etc/shadow-, n)
+ @$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/generic/etc/shadow, /etc/shadow, n)
+ @$(call install_copy, rootfs, 0, 0, 0600, $(PTXDIST_TOPDIR)/generic/etc/shadow-, /etc/shadow-, n)
endif
ifdef PTXCONF_ROOTFS_GENERIC_UDHCPC
- @$(call install_copy, rootfs, 0, 0, 0744, $(PTXDIST_TOPDIR)/projects-example/generic/etc/udhcpc.script,/etc/udhcpc.script, n)
+ @$(call install_copy, rootfs, 0, 0, 0744, $(PTXDIST_TOPDIR)/generic/etc/udhcpc.script,/etc/udhcpc.script, n)
# udhcp expects the script to be called /usr/share/udhcpc/default.script, so we make a link
@$(call install_link, rootfs, /etc/udhcpc.script, /usr/share/udhcpc/default.script)
endif
@@ -330,29 +330,29 @@ ifdef PTXCONF_ROOTFS_ETC_INITD
# Copy generic etc/init.d
@$(call install_copy, rootfs, 0, 0, 0755, /etc/init.d)
ifdef PTXCONF_ROOTFS_ETC_INITD_RCS
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/rcS, /etc/init.d/rcS, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/rcS, /etc/init.d/rcS, n)
endif
ifdef PTXCONF_ROOTFS_ETC_INITD_LOGROTATE
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/logrotate, /etc/init.d/logrotate, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/logrotate, /etc/init.d/logrotate, n)
endif
ifdef PTXCONF_ROOTFS_ETC_INITD_INETD
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/inetd, /etc/init.d/inetd, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/inetd, /etc/init.d/inetd, n)
ifneq ($(PTXCONF_ROOTFS_ETC_INITD_INETD_LINK),"")
@$(call install_link, rootfs, ../init.d/inetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_INETD_LINK))
endif
endif
ifdef PTXCONF_ROOTFS_ETC_INITD_MODULES
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/modules, /etc/init.d/modules, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/modules, /etc/init.d/modules, n)
ifneq ($(PTXCONF_ROOTFS_ETC_INITD_MODULES_LINK),"")
@$(call install_link, rootfs, ../init.d/modules, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_MODULES_LINK))
endif
endif
ifdef PTXCONF_ROOTFS_ETC_INITD_NETWORKING
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/networking, /etc/init.d/networking, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/networking, /etc/init.d/networking, n)
@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-down.d)
@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-up.d)
@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-post-down.d)
@@ -366,14 +366,14 @@ endif
endif
ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/telnetd, /etc/init.d/telnetd, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/telnetd, /etc/init.d/telnetd, n)
ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK),"")
@$(call install_link, rootfs, ../init.d/telnetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK))
endif
endif
ifdef PTXCONF_ROOTFS_ETC_INITD_DROPBEAR
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/dropbear, /etc/init.d/dropbear, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/dropbear, /etc/init.d/dropbear, n)
ifneq ($(PTXCONF_ROOTFS_ETC_INITD_DROPBEAR_LINK),"")
@$(call install_link, rootfs, ../init.d/dropbear, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_DROPBEAR_LINK))
@@ -381,7 +381,7 @@ endif
endif
ifdef PTXCONF_ROOTFS_ETC_INITD_SSHD
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/sshd, /etc/init.d/sshd, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/sshd, /etc/init.d/sshd, n)
ifneq ($(PTXCONF_ROOTFS_ETC_INITD_SSHD_LINK),"")
@$(call install_link, rootfs, ../init.d/sshd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_SSHD_LINK))
@@ -389,14 +389,14 @@ endif
endif
ifdef PTXCONF_ROOTFS_ETC_INITD_SYSLOGNG
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/syslog-ng, /etc/init.d/syslog-ng, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/syslog-ng, /etc/init.d/syslog-ng, n)
ifneq ($(PTXCONF_ROOTFS_ETC_INITD_SYSLOGNG_LINK),"")
@$(call install_link, rootfs, ../init.d/syslog-ng, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_SYSLOGNG_LINK))
endif
endif
ifdef PTXCONF_ROOTFS_ETC_INITD_STARTUP
- @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/startup, /etc/init.d/startup, n)
+ @$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/startup, /etc/init.d/startup, n)
endif
@$(call install_copy, rootfs, 0, 0, 0755, /etc/rc.d)
@@ -404,7 +404,7 @@ endif
ifdef PTXCONF_ROOTFS_ETC_INITD_BANNER
@$(call install_copy, rootfs, 0, 0, 0755, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/banner, \
+ $(PTXDIST_TOPDIR)/generic/etc/init.d/banner, \
/etc/init.d/banner, n)
@$(call install_replace, rootfs, /etc/init.d/banner, @VENDOR@, $(PTXCONF_ROOTFS_ETC_VENDOR) )
diff --git a/rules/rsync.in b/rules/rsync.in
index b9b3fb82e..d31f74d9e 100644
--- a/rules/rsync.in
+++ b/rules/rsync.in
@@ -37,7 +37,7 @@ config RSYNC_CONFIG_FILE_DEFAULT
bool
prompt "Use default"
help
- The file from projects-example/generic/etc/rsyncd.conf will be used.
+ The file from generic/etc/rsyncd.conf will be used.
Its a very good idea to start with this default file and save a
customised version into your project, because the generic file is
really useless. You can use it if you select "Use your own" after that.
@@ -71,7 +71,7 @@ config RSYNC_AUTH_FILE_PATH
help
Enter a local path and filename to be used as a secrets file on
your target. As a starting point you can use the
- projects-example/generic/etc/rsyncd.secrets file. Leave this entry
+ generic/etc/rsyncd.secrets file. Leave this entry
empty if you do not want to use authentication.
comment "rsync runtime options ---"
diff --git a/rules/rsync.make b/rules/rsync.make
index 2e2b9dbb3..a7e298b7f 100644
--- a/rules/rsync.make
+++ b/rules/rsync.make
@@ -138,12 +138,12 @@ $(STATEDIR)/rsync.targetinstall: $(rsync_targetinstall_deps_default)
ifdef PTXCONF_RSYNC_CONFIG_FILE_DEFAULT
ifneq ($(call remove_quotes,$(PTXCONF_RSYNC_CONFIG_FILE)),)
@$(call install_copy, rsync, 0, 0, 0644, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/rsyncd.conf, \
+ $(PTXDIST_TOPDIR)/generic/etc/rsyncd.conf, \
$(PTXCONF_RSYNC_CONFIG_FILE) )
else
# use default
@$(call install_copy, rsync, 0, 0, 0644, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/rsyncd.conf, \
+ $(PTXDIST_TOPDIR)/generic/etc/rsyncd.conf, \
/etc/rsyncd.conf)
endif
endif
diff --git a/rules/syslogng.make b/rules/syslogng.make
index 158e5521c..d16316fee 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -144,7 +144,7 @@ $(STATEDIR)/syslogng.targetinstall: $(syslogng_targetinstall_deps_default)
ifdef PTXCONF_ROOTFS_GENERIC_SYSLOGNG
@$(call install_copy, syslogng, 0, 0, 0644, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/syslog-ng.conf, \
+ $(PTXDIST_TOPDIR)/generic/etc/syslog-ng.conf, \
/etc/syslog-ng.conf)
endif
@$(call install_finish, syslogng)
diff --git a/rules/thttpd.make b/rules/thttpd.make
index d02f46e5a..a2097e7d7 100644
--- a/rules/thttpd.make
+++ b/rules/thttpd.make
@@ -118,7 +118,7 @@ ifdef PTXCONF_ROOTFS_ETC_INITD_THTTPD
ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_USER_FILE)),)
@$(call install_copy, thttpd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_THTTPD_USER_FILE), /etc/init.d/thttpd, n)
else
- @$(call install_copy, thttpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/thttpd, /etc/init.d/thttpd, n)
+ @$(call install_copy, thttpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/thttpd, /etc/init.d/thttpd, n)
endif
endif
ifneq ($(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK),"")
@@ -126,7 +126,7 @@ ifneq ($(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK),"")
@$(call install_link, thttpd, ../init.d/thttpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK))
endif
@$(call install_copy, thttpd, 12, 102, 0755, /var/www)
- @$(call install_copy, thttpd, 12, 102, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/thttpd.html, /var/www/index.html, n)
+ @$(call install_copy, thttpd, 12, 102, 0644, $(PTXDIST_TOPDIR)/generic/thttpd.html, /var/www/index.html, n)
@$(call install_finish, thttpd)
@$(call touch, $@)
diff --git a/rules/udev.make b/rules/udev.make
index 22b6f1dfd..a6e51fb61 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -110,12 +110,12 @@ $(STATEDIR)/udev.targetinstall: $(udev_targetinstall_deps_default)
@$(call install_fixup, udev,DEPENDS,)
@$(call install_fixup, udev,DESCRIPTION,missing)
- @$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/udev/udev.conf, /etc/udev/udev.conf, n)
+ @$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/udev/udev.conf, /etc/udev/udev.conf, n)
ifdef PTXCONF_ROOTFS_ETC_INITD_UDEV
ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_UDEV_USER_FILE)),)
@$(call install_copy, udev, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_UDEV_USER_FILE), /etc/init.d/udev, n)
else
- @$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/udev, /etc/init.d/udev, n)
+ @$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/udev, /etc/init.d/udev, n)
endif
endif
diff --git a/rules/utelnetd.make b/rules/utelnetd.make
index adabc2db6..d56f1c94b 100644
--- a/rules/utelnetd.make
+++ b/rules/utelnetd.make
@@ -2,7 +2,7 @@
# $Id$
#
# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
-# See CREDITS for details about who has contributed to this project.
+# See CREDITS for details about who has contributed to this project.
#
# For further information about the PTXdist project and license conditions
# see the README file.
@@ -14,9 +14,9 @@
PACKAGES-$(PTXCONF_UTELNETD) += utelnetd
#
-# Paths and names
+# Paths and names
#
-UTELNETD_VERSION = 0.1.6
+UTELNETD_VERSION = 0.1.9
UTELNETD = utelnetd-$(UTELNETD_VERSION)
UTELNETD_URL = http://www.pengutronix.de/software/utelnetd/$(UTELNETD).tar.gz
UTELNETD_SOURCE = $(SRCDIR)/$(UTELNETD).tar.gz
@@ -101,9 +101,9 @@ $(STATEDIR)/utelnetd.targetinstall: $(utelnetd_targetinstall_deps_default)
@$(call install_fixup, utelnetd,DEPENDS,)
@$(call install_fixup, utelnetd,DESCRIPTION,missing)
ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD
-ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD_DEFAULT
+ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD_DEFAULT
@$(call install_copy, utelnetd, 0, 0, 0755, \
- $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/telnetd, \
+ $(PTXDIST_TOPDIR)/generic/etc/init.d/telnetd, \
/etc/init.d/telnetd, n)
else
ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_USER_FILE),"")
@@ -126,7 +126,7 @@ endif
# Clean
# ----------------------------------------------------------------------------
-utelnetd_clean:
+utelnetd_clean:
rm -rf $(STATEDIR)/utelnetd.* $(UTELNETD_DIR)
# vim: syntax=make
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-26 14:49:41 +0000