4a7252bab
Rob Landley
2005-10-08
Subject
Rename CONFIG_NFSMOUNT to CONFIG_FEATURE_MOUNT_NFS so allbaseconfig can find it (and tweak defconfig to catch up).
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
sysdeps/linux/defconfig +2 -1util-linux/Config.in +1 -1util-linux/Makefile.in +1 -1util-linux/mount.c +2 -2
sysdeps/linux/defconfig+2 -1
| @@ -121,6 +121,7 @@ CONFIG_RMDIR=y | |
| CONFIG_SLEEP=y | |
| # CONFIG_FEATURE_FANCY_SLEEP is not set | |
| CONFIG_SORT=y | |
| + | CONFIG_FEATURE_SORT_BIG=y |
| # CONFIG_STTY is not set | |
| CONFIG_SYNC=y | |
| CONFIG_TAIL=y | |
| @@ -407,7 +408,7 @@ CONFIG_PIVOT_ROOT=y | |
| # CONFIG_RDATE is not set | |
| CONFIG_SWAPONOFF=y | |
| CONFIG_MOUNT=y | |
| - | # CONFIG_NFSMOUNT is not set |
| + | # CONFIG_FEATURE_MOUNT_NFS is not set |
| CONFIG_UMOUNT=y | |
| # | |
util-linux/Config.in+1 -1
| @@ -325,7 +325,7 @@ config CONFIG_MOUNT | |
| NFS filesystems. Most people using BusyBox will also want to enable | |
| the 'mount' utility. | |
| - | config CONFIG_NFSMOUNT |
| + | config CONFIG_FEATURE_MOUNT_NFS |
| bool " Support mounting NFS file systems" | |
| default n | |
| depends on CONFIG_MOUNT | |
util-linux/Makefile.in+1 -1
| @@ -28,7 +28,7 @@ UTILLINUX-$(CONFIG_MKFS_MINIX) +=mkfs_minix.o | |
| UTILLINUX-$(CONFIG_MKSWAP) +=mkswap.o | |
| UTILLINUX-$(CONFIG_MORE) +=more.o | |
| UTILLINUX-$(CONFIG_MOUNT) +=mount.o | |
| - | UTILLINUX-$(CONFIG_NFSMOUNT) +=nfsmount.o |
| + | UTILLINUX-$(CONFIG_FEATURE_MOUNT_NFS) +=nfsmount.o |
| UTILLINUX-$(CONFIG_PIVOT_ROOT) +=pivot_root.o | |
| UTILLINUX-$(CONFIG_RDATE) +=rdate.o | |
| UTILLINUX-$(CONFIG_READPROFILE) +=readprofile.o | |
util-linux/mount.c+2 -2
| @@ -37,7 +37,7 @@ | |
| /* This is just a warning of a common mistake. Possibly this should be a | |
| * uclibc faq entry rather than in busybox... */ | |
| - | #if ENABLE_NFSMOUNT && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) |
| + | #if ENABLE_FEATURE_MOUNT_NFS && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) |
| #error "You need to build uClibc with UCLIBC_HAS_RPC for busybox mount with NFS support to compile." | |
| #endif | |
| @@ -278,7 +278,7 @@ singlemount: | |
| // Might this be an NFS filesystem? | |
| - | if(ENABLE_NFSMOUNT && (!fsType || !strcmp(fsType,"nfs")) && |
| + | if(ENABLE_FEATURE_MOUNT_NFS && (!fsType || !strcmp(fsType,"nfs")) && |
| strchr(blockDevice, ':') != NULL) | |
| { | |
| if(nfsmount(blockDevice, directory, &flags, &string_flags, 1)) | |