Loading package/e2fsprogs/e2fsprogs.mk +42 −19 Original line number Diff line number Diff line Loading @@ -30,9 +30,6 @@ define HOST_E2FSPROGS_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs endef $(eval $(call AUTOTARGETS,package,e2fsprogs)) $(eval $(call AUTOTARGETS,package,e2fsprogs,host)) # binaries to keep or remove E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BLKID) += usr/sbin/blkid Loading Loading @@ -68,32 +65,58 @@ E2FSPROGS_TXTTARGETS_ = \ usr/sbin/findfs \ usr/sbin/tune2fs $(E2FSPROGS_HOOK_POST_INSTALL): $(call MESSAGE,"Post installing") # remove unneeded define E2FSPROGS_TARGET_REMOVE_UNNEEDED rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_BINTARGETS_)) rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_TXTTARGETS_)) # make symlinks endef E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_REMOVE_UNNEEDED define E2FSPROGS_TARGET_MKE2FS_SYMLINKS ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext2 ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext3 ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4 ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4dev endef ifeq ($(BR2_PACKAGE_E2FSPROGS_MKE2FS),y) ln -sf mke2fs ${TARGET_DIR}/usr/sbin/mkfs.ext2 ln -sf mke2fs ${TARGET_DIR}/usr/sbin/mkfs.ext3 ln -sf mke2fs ${TARGET_DIR}/usr/sbin/mkfs.ext4 ln -sf mke2fs ${TARGET_DIR}/usr/sbin/mkfs.ext4dev E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_MKE2FS_SYMLINKS endif define E2FSPROGS_TARGET_E2FSCK_SYMLINKS ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext2 ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext3 ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4 ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4dev endef ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y) ln -sf e2fsck ${TARGET_DIR}/usr/sbin/fsck.ext2 ln -sf e2fsck ${TARGET_DIR}/usr/sbin/fsck.ext3 ln -sf e2fsck ${TARGET_DIR}/usr/sbin/fsck.ext4 ln -sf e2fsck ${TARGET_DIR}/usr/sbin/fsck.ext4dev E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_E2FSCK_SYMLINKS endif define E2FSPROGS_TARGET_TUNE2FS_SYMLINK ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs endef ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y) ln -sf e2label ${TARGET_DIR}/usr/sbin/tune2fs E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK endif define E2FSPROGS_TARGET_FINDFS_SYMLINK ln -sf e2label $(TARGET_DIR)/usr/sbin/findfs endef ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y) ln -sf e2label ${TARGET_DIR}/usr/sbin/findfs E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK endif define E2FSPROGS_STAGING_LIBUUID_INSTALL install -D $(@D)/lib/uuid/uuid.h $(STAGING_DIR)/usr/include/uuid/uuid.h endef ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBUUID),y) install -D ${E2FSPROGS_SRCDIR}/lib/uuid/uuid.h ${STAGING_DIR}/usr/include/uuid/uuid.h E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBUUID_INSTALL endif touch $@ $(eval $(call AUTOTARGETS,package,e2fsprogs)) $(eval $(call AUTOTARGETS,package,e2fsprogs,host)) Loading
package/e2fsprogs/e2fsprogs.mk +42 −19 Original line number Diff line number Diff line Loading @@ -30,9 +30,6 @@ define HOST_E2FSPROGS_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs endef $(eval $(call AUTOTARGETS,package,e2fsprogs)) $(eval $(call AUTOTARGETS,package,e2fsprogs,host)) # binaries to keep or remove E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BLKID) += usr/sbin/blkid Loading Loading @@ -68,32 +65,58 @@ E2FSPROGS_TXTTARGETS_ = \ usr/sbin/findfs \ usr/sbin/tune2fs $(E2FSPROGS_HOOK_POST_INSTALL): $(call MESSAGE,"Post installing") # remove unneeded define E2FSPROGS_TARGET_REMOVE_UNNEEDED rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_BINTARGETS_)) rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_TXTTARGETS_)) # make symlinks endef E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_REMOVE_UNNEEDED define E2FSPROGS_TARGET_MKE2FS_SYMLINKS ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext2 ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext3 ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4 ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4dev endef ifeq ($(BR2_PACKAGE_E2FSPROGS_MKE2FS),y) ln -sf mke2fs ${TARGET_DIR}/usr/sbin/mkfs.ext2 ln -sf mke2fs ${TARGET_DIR}/usr/sbin/mkfs.ext3 ln -sf mke2fs ${TARGET_DIR}/usr/sbin/mkfs.ext4 ln -sf mke2fs ${TARGET_DIR}/usr/sbin/mkfs.ext4dev E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_MKE2FS_SYMLINKS endif define E2FSPROGS_TARGET_E2FSCK_SYMLINKS ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext2 ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext3 ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4 ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4dev endef ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y) ln -sf e2fsck ${TARGET_DIR}/usr/sbin/fsck.ext2 ln -sf e2fsck ${TARGET_DIR}/usr/sbin/fsck.ext3 ln -sf e2fsck ${TARGET_DIR}/usr/sbin/fsck.ext4 ln -sf e2fsck ${TARGET_DIR}/usr/sbin/fsck.ext4dev E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_E2FSCK_SYMLINKS endif define E2FSPROGS_TARGET_TUNE2FS_SYMLINK ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs endef ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y) ln -sf e2label ${TARGET_DIR}/usr/sbin/tune2fs E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK endif define E2FSPROGS_TARGET_FINDFS_SYMLINK ln -sf e2label $(TARGET_DIR)/usr/sbin/findfs endef ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y) ln -sf e2label ${TARGET_DIR}/usr/sbin/findfs E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK endif define E2FSPROGS_STAGING_LIBUUID_INSTALL install -D $(@D)/lib/uuid/uuid.h $(STAGING_DIR)/usr/include/uuid/uuid.h endef ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBUUID),y) install -D ${E2FSPROGS_SRCDIR}/lib/uuid/uuid.h ${STAGING_DIR}/usr/include/uuid/uuid.h E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBUUID_INSTALL endif touch $@ $(eval $(call AUTOTARGETS,package,e2fsprogs)) $(eval $(call AUTOTARGETS,package,e2fsprogs,host))