diff options
-rw-r--r-- | meta/recipes-core/busybox/busybox/defconfig | 18 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox/mount-via-label.cfg | 9 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.23.2.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_git.bb | 1 |
4 files changed, 18 insertions, 11 deletions
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index c5d3275e83..4f5df9ebee 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig | |||
@@ -603,7 +603,7 @@ CONFIG_MOUNT=y | |||
603 | # CONFIG_FEATURE_MOUNT_FAKE is not set | 603 | # CONFIG_FEATURE_MOUNT_FAKE is not set |
604 | # CONFIG_FEATURE_MOUNT_VERBOSE is not set | 604 | # CONFIG_FEATURE_MOUNT_VERBOSE is not set |
605 | # CONFIG_FEATURE_MOUNT_HELPERS is not set | 605 | # CONFIG_FEATURE_MOUNT_HELPERS is not set |
606 | CONFIG_FEATURE_MOUNT_LABEL=y | 606 | # CONFIG_FEATURE_MOUNT_LABEL is not set |
607 | CONFIG_FEATURE_MOUNT_NFS=y | 607 | CONFIG_FEATURE_MOUNT_NFS=y |
608 | # CONFIG_FEATURE_MOUNT_CIFS is not set | 608 | # CONFIG_FEATURE_MOUNT_CIFS is not set |
609 | CONFIG_FEATURE_MOUNT_FLAGS=y | 609 | CONFIG_FEATURE_MOUNT_FLAGS=y |
@@ -629,24 +629,20 @@ CONFIG_FEATURE_UMOUNT_ALL=y | |||
629 | CONFIG_FEATURE_MOUNT_LOOP=y | 629 | CONFIG_FEATURE_MOUNT_LOOP=y |
630 | CONFIG_FEATURE_MOUNT_LOOP_CREATE=y | 630 | CONFIG_FEATURE_MOUNT_LOOP_CREATE=y |
631 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | 631 | # CONFIG_FEATURE_MTAB_SUPPORT is not set |
632 | CONFIG_VOLUMEID=y | 632 | # CONFIG_VOLUMEID is not set |
633 | |||
634 | # | ||
635 | # Filesystem/Volume identification | ||
636 | # | ||
637 | # CONFIG_FEATURE_VOLUMEID_BTRFS is not set | 633 | # CONFIG_FEATURE_VOLUMEID_BTRFS is not set |
638 | # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set | 634 | # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set |
639 | CONFIG_FEATURE_VOLUMEID_EXFAT=y | 635 | # CONFIG_FEATURE_VOLUMEID_EXFAT is not set |
640 | CONFIG_FEATURE_VOLUMEID_EXT=y | 636 | # CONFIG_FEATURE_VOLUMEID_EXT is not set |
641 | CONFIG_FEATURE_VOLUMEID_F2FS=y | 637 | # CONFIG_FEATURE_VOLUMEID_F2FS is not set |
642 | CONFIG_FEATURE_VOLUMEID_FAT=y | 638 | # CONFIG_FEATURE_VOLUMEID_FAT is not set |
643 | # CONFIG_FEATURE_VOLUMEID_HFS is not set | 639 | # CONFIG_FEATURE_VOLUMEID_HFS is not set |
644 | # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set | 640 | # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set |
645 | # CONFIG_FEATURE_VOLUMEID_JFS is not set | 641 | # CONFIG_FEATURE_VOLUMEID_JFS is not set |
646 | # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set | 642 | # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set |
647 | # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set | 643 | # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set |
648 | # CONFIG_FEATURE_VOLUMEID_LUKS is not set | 644 | # CONFIG_FEATURE_VOLUMEID_LUKS is not set |
649 | CONFIG_FEATURE_VOLUMEID_NILFS=y | 645 | # CONFIG_FEATURE_VOLUMEID_NILFS is not set |
650 | # CONFIG_FEATURE_VOLUMEID_NTFS is not set | 646 | # CONFIG_FEATURE_VOLUMEID_NTFS is not set |
651 | # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set | 647 | # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set |
652 | # CONFIG_FEATURE_VOLUMEID_REISERFS is not set | 648 | # CONFIG_FEATURE_VOLUMEID_REISERFS is not set |
diff --git a/meta/recipes-core/busybox/busybox/mount-via-label.cfg b/meta/recipes-core/busybox/busybox/mount-via-label.cfg new file mode 100644 index 0000000000..2fe7ab2e5f --- /dev/null +++ b/meta/recipes-core/busybox/busybox/mount-via-label.cfg | |||
@@ -0,0 +1,9 @@ | |||
1 | CONFIG_BLKID=y | ||
2 | CONFIG_FEATURE_BLKID_TYPE=y | ||
3 | CONFIG_FEATURE_MOUNT_LABEL=y | ||
4 | CONFIG_VOLUMEID=y | ||
5 | CONFIG_FEATURE_VOLUMEID_BTRFS=y | ||
6 | CONFIG_FEATURE_VOLUMEID_EXT=y | ||
7 | CONFIG_FEATURE_VOLUMEID_F2FS=y | ||
8 | CONFIG_FEATURE_VOLUMEID_FAT=y | ||
9 | CONFIG_FEATURE_VOLUMEID_SQUASHFS=y | ||
diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb b/meta/recipes-core/busybox/busybox_1.23.2.bb index 85e462ec58..b84f499648 100644 --- a/meta/recipes-core/busybox/busybox_1.23.2.bb +++ b/meta/recipes-core/busybox/busybox_1.23.2.bb | |||
@@ -32,6 +32,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
32 | file://busybox-cross-menuconfig.patch \ | 32 | file://busybox-cross-menuconfig.patch \ |
33 | file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \ | 33 | file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \ |
34 | file://0001-chown-fix-help-text.patch \ | 34 | file://0001-chown-fix-help-text.patch \ |
35 | file://mount-via-label.cfg \ | ||
35 | " | 36 | " |
36 | 37 | ||
37 | SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73" | 38 | SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73" |
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index c5596d8ed0..71e6c13b71 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb | |||
@@ -38,6 +38,7 @@ SRC_URI = "git://busybox.net/busybox.git \ | |||
38 | file://busybox-cross-menuconfig.patch \ | 38 | file://busybox-cross-menuconfig.patch \ |
39 | file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \ | 39 | file://0001-ifconfig-fix-double-free-fatal-error-in-INET_sprint.patch \ |
40 | file://0001-chown-fix-help-text.patch \ | 40 | file://0001-chown-fix-help-text.patch \ |
41 | file://mount-via-label.cfg \ | ||
41 | " | 42 | " |
42 | 43 | ||
43 | EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" | 44 | EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" |