| Message ID | f8163e366a4bfd68d3232e83ae6e5d16b8e90761.1457721607.git.yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
Hi Yann, All, Le 11/03/2016 19:41, Yann E. MORIN a écrit : > post-target rules are probably not resilient to parallel builds, given > that they do not depend on the image being generated first. > > Beside, we already have a mechanism for running stuff after the > filesystem is generated, and that's called post-gen hooks. > > Use those hooks. > > Note: this basically reverts 75b6303 (rootfs-ext2: make the symlink as a > _POST_TARGET) since we've now re-introduced post-gen hooks. > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: Arnout Vandecappelle <arnout@mind.be> > --- > fs/ext2/ext2.mk | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk > index 7417f81..afe44c7 100644 > --- a/fs/ext2/ext2.mk > +++ b/fs/ext2/ext2.mk > @@ -34,13 +34,11 @@ define ROOTFS_EXT2_CMD > PATH=$(BR_PATH) mke2img -d $(TARGET_DIR) $(EXT2_OPTS) -o $@ > endef > > -rootfs-ext2-symlink: > - ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT) > - > -.PHONY: rootfs-ext2-symlink > - > ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2) > -ROOTFS_EXT2_POST_TARGETS += rootfs-ext2-symlink > +define ROOTFS_EXT2_SYMLINK > + ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT) > +endef > +ROOTFS_EXT2_POST_GEN_HOOKS += ROOTFS_EXT2_SYMLINK > endif Verified that the rootfs.ext3 symlink to rootfs.ext2 is still created. Reviewed-by: Romain Naour <romain.naour@gmail.com> Best regards, Romain > > $(eval $(call ROOTFS_TARGET,ext2)) >
diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index 7417f81..afe44c7 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -34,13 +34,11 @@ define ROOTFS_EXT2_CMD PATH=$(BR_PATH) mke2img -d $(TARGET_DIR) $(EXT2_OPTS) -o $@ endef -rootfs-ext2-symlink: - ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT) - -.PHONY: rootfs-ext2-symlink - ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2) -ROOTFS_EXT2_POST_TARGETS += rootfs-ext2-symlink +define ROOTFS_EXT2_SYMLINK + ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT) +endef +ROOTFS_EXT2_POST_GEN_HOOKS += ROOTFS_EXT2_SYMLINK endif $(eval $(call ROOTFS_TARGET,ext2))
post-target rules are probably not resilient to parallel builds, given that they do not depend on the image being generated first. Beside, we already have a mechanism for running stuff after the filesystem is generated, and that's called post-gen hooks. Use those hooks. Note: this basically reverts 75b6303 (rootfs-ext2: make the symlink as a _POST_TARGET) since we've now re-introduced post-gen hooks. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Arnout Vandecappelle <arnout@mind.be> --- fs/ext2/ext2.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)