diff options
| author | Juergen Beisert <j.beisert@pengutronix.de> | 2006-11-13 13:10:58 +0000 |
|---|---|---|
| committer | Juergen Beisert <j.beisert@pengutronix.de> | 2006-11-13 13:10:58 +0000 |
| commit | 8a956eaacca8ab966143ac8a702684974343510a (patch) | |
| tree | c1800dc12c5255e4e0bb66b4fc0b22b607b372cb /rules | |
| parent | 9aa0041875f9caa489733e66114d7829b3aa033a (diff) | |
| download | ptxdist-8a956eaacca8ab966143ac8a702684974343510a.tar.gz ptxdist-8a956eaacca8ab966143ac8a702684974343510a.tar.xz | |
tried to solve the dependencies problem, not solved yet
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6317 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/rootfs.make | 22 | ||||
| -rw-r--r-- | rules/rootfs_configfiles.inc | 2 | ||||
| -rw-r--r-- | rules/rootfs_inetd.inc | 2 | ||||
| -rw-r--r-- | rules/rootfs_init_d.inc | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/rules/rootfs.make b/rules/rootfs.make index 540940857..eac2885d8 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -90,7 +90,8 @@ include ${PTXDIST_TOPDIR}/rules/rootfs_init_d.inc # # Subtarget to create this ipkg # -rootfs_sub_start_ipkg: +$(STATEDIR)/rootfs.sub_start_ipkg: + @$(call targetinfo, rootfs_targetinstall) @$(call install_init, rootfs) @@ -106,7 +107,7 @@ rootfs_sub_start_ipkg: # # Subtarget to create rootfs' directory structure # -rootfs_sub_populate_structure: +$(STATEDIR)/rootfs.sub_populate_structure: ifdef PTXCONF_ROOTFS_DEV @$(call install_copy, rootfs, 0, 0, 0755, /dev) @@ -178,19 +179,26 @@ endif ifdef PTXCONF_ROOTFS_VAR_LOCK @$(call install_copy, rootfs, 0, 0, 0755, /var/lock) endif + # --------------------------------------------------------- rootfs_targetinstall: $(STATEDIR)/rootfs.targetinstall $(STATEDIR)/rootfs.targetinstall: $(rootfs_targetinstall_deps_default) \ - rootfs_sub_start_ipkg \ - rootfs_sub_populate_structure \ - populate_init_d_scripts \ - populate_config_files \ - populate_inetd_conf + $(STATEDIR)/rootfs.sub_start_ipkg \ + $(STATEDIR)/rootfs.sub_populate_structure \ + $(STATEDIR)/rootfs.sub_populate_init_d_scripts \ + $(STATEDIR)/rootfs.sub_populate_config_files \ + $(STATEDIR)/rootfs.sub_populate_inetd_conf @$(call install_finish, rootfs) +# Everything seems all right. So mark all as successfully done + @$(call touch, $(STATEDIR)/rootfs.sub_start_ipkg) + @$(call touch, $(STATEDIR)/rootfs.sub_populate_structure) + @$(call touch, $(STATEDIR)/rootfs.sub_populate_init_d_scripts) + @$(call touch, $(STATEDIR)/rootfs.sub_populate_config_files) + @$(call touch, $(STATEDIR)/rootfs.sub_populate_inetd_conf) @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/rootfs_configfiles.inc b/rules/rootfs_configfiles.inc index 4248afa12..b64edb1a7 100644 --- a/rules/rootfs_configfiles.inc +++ b/rules/rootfs_configfiles.inc @@ -18,7 +18,7 @@ # # "populate_config_files" is a subtarget. See rootfs.make for use # -populate_config_files: +$(STATEDIR)/rootfs.sub_populate_config_files: ifdef PTXCONF_ROOTFS_PASSWD # /etc/passwd diff --git a/rules/rootfs_inetd.inc b/rules/rootfs_inetd.inc index c29c2a856..7fca0d170 100644 --- a/rules/rootfs_inetd.inc +++ b/rules/rootfs_inetd.inc @@ -16,7 +16,7 @@ # # "populate_inetd_conf" is a subtarget. See rootfs.make for use # -populate_inetd_conf: +$(STATEDIR)/rootfs.sub_populate_inetd_conf: ifdef PTXCONF_ROOTFS_INETD # /etc/inetd.conf diff --git a/rules/rootfs_init_d.inc b/rules/rootfs_init_d.inc index f8d3f3ede..c2a512ce6 100644 --- a/rules/rootfs_init_d.inc +++ b/rules/rootfs_init_d.inc @@ -17,7 +17,7 @@ # # "populate_init.d_scripts" is a subtarget. See rootfs.make for use # -populate_init_d_scripts: +$(STATEDIR)/rootfs.sub_populate_init_d_scripts: # generate the directories first @$(call install_copy, rootfs, 0, 0, 0755, /etc/init.d) |