[PATCH] fs: Makefile: Add parseopt to all builds

[PATCH] fs: Makefile: Add parseopt to all builds

[Daniel Schultz]

parseopt.h was included to fs.c with commit 9248b, but parseopt.o has a
dependency to CONFIG_FS_NFS.

Moved parseopt.o to the default build to eliminate build failures.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
---
 fs/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/Makefile b/fs/Makefile
index f2bb702..b3f929f 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -4,11 +4,11 @@ obj-$(CONFIG_FS_RAMFS)	+= ramfs.o
 obj-y			+= devfs-core.o
 obj-$(CONFIG_FS_DEVFS)	+= devfs.o
 obj-$(CONFIG_FS_FAT)	+= fat/
-obj-y	+= fs.o
+obj-y	+= fs.o parseopt.o
 obj-$(CONFIG_FS_UBIFS)	+= ubifs/
 obj-$(CONFIG_FS_TFTP)	+= tftp.o
 obj-$(CONFIG_FS_OMAP4_USBBOOT)	+= omap4_usbbootfs.o
-obj-$(CONFIG_FS_NFS)	+= nfs.o parseopt.o
+obj-$(CONFIG_FS_NFS)	+= nfs.o
 obj-$(CONFIG_FS_BPKFS) += bpkfs.o
 obj-$(CONFIG_FS_UIMAGEFS)	+= uimagefs.o
 obj-$(CONFIG_FS_EFI)	 += efi.o
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] fs: Makefile: Add parseopt to all builds

[Sascha Hauer]

On Fri, Jun 02, 2017 at 01:11:36PM +0200, Daniel Schultz wrote:
> parseopt.h was included to fs.c with commit 9248b, but parseopt.o has a
> dependency to CONFIG_FS_NFS.
> 
> Moved parseopt.o to the default build to eliminate build failures.
> 
> Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
> ---
>  fs/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/fs/Makefile b/fs/Makefile
> index f2bb702..b3f929f 100644
> --- a/fs/Makefile
> +++ b/fs/Makefile
> @@ -4,11 +4,11 @@ obj-$(CONFIG_FS_RAMFS)	+= ramfs.o
>  obj-y			+= devfs-core.o
>  obj-$(CONFIG_FS_DEVFS)	+= devfs.o
>  obj-$(CONFIG_FS_FAT)	+= fat/
> -obj-y	+= fs.o
> +obj-y	+= fs.o parseopt.o
>  obj-$(CONFIG_FS_UBIFS)	+= ubifs/
>  obj-$(CONFIG_FS_TFTP)	+= tftp.o
>  obj-$(CONFIG_FS_OMAP4_USBBOOT)	+= omap4_usbbootfs.o
> -obj-$(CONFIG_FS_NFS)	+= nfs.o parseopt.o
> +obj-$(CONFIG_FS_NFS)	+= nfs.o
>  obj-$(CONFIG_FS_BPKFS) += bpkfs.o
>  obj-$(CONFIG_FS_UIMAGEFS)	+= uimagefs.o
>  obj-$(CONFIG_FS_EFI)	 += efi.o
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox