All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 2/2] aufs: initial release (selects aufs-utils)
       [not found] <1406575604-19545-1-git-send-email-mail@steffenhoenig.com>
@ 2014-07-28 19:26 ` steffenhoenig
  2014-07-28 19:49   ` Thomas De Schampheleire
  0 siblings, 1 reply; 4+ messages in thread
From: steffenhoenig @ 2014-07-28 19:26 UTC (permalink / raw)
  To: buildroot

Signed-off-by: steffenhoenig <mail@steffenhoenig.com>
---
 package/Config.in      |  1 +
 package/aufs/Config.in | 36 ++++++++++++++++++++++++++++++++++++
 package/aufs/aufs.mk   | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 package/aufs/Config.in
 create mode 100644 package/aufs/aufs.mk

diff --git a/package/Config.in b/package/Config.in
index b49908c..0225e9f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -136,6 +136,7 @@ endif
 endmenu
 
 menu "Filesystem and flash utilities"
+	source "package/aufs/Config.in"
 	source "package/aufs-utils/Config.in"
 	source "package/btrfs-progs/Config.in"
 	source "package/cifs-utils/Config.in"
diff --git a/package/aufs/Config.in b/package/aufs/Config.in
new file mode 100644
index 0000000..e7842bd
--- /dev/null
+++ b/package/aufs/Config.in
@@ -0,0 +1,36 @@
+config BR2_PACKAGE_AUFS
+        bool "aufs"
+        select BR2_PACKAGE_AUFS_UTILS
+        help
+          Aufs3 -- advanced multi layered unification filesystem version 3.x
+
+comment "aufs needs a Linux kernel to be built"
+    depends on !BR2_LINUX_KERNEL
+
+if BR2_PACKAGE_AUFS
+
+choice 
+    prompt "version"
+
+config BR2_PACKAGE_AUFS_LATEST_VERSION
+    bool "aufs3.15"
+
+config BR2_PACKAGE_AUFS_CUSTOM_VERSION
+    bool "custom version"
+    help
+      This option allows to use a specific aufs kernel patch set
+
+      Note: you need to insert the version string like aufs3.12, aufs3.9, ...
+
+endchoice
+
+config BR2_PACKAGE_AUFS_CUSTOM_VERSION_VALUE
+    string ""
+    depends on BR2_PACKAGE_AUFS_CUSTOM_VERSION
+
+config BR2_PACKAGE_AUFS_VERSION
+    string
+    default "aufs3.15" if BR2_PACKAGE_AUFS_LATEST_VERSION
+    default BR2_PACKAGE_AUFS_CUSTOM_VERSION_VALUE \
+        if BR2_PACKAGE_AUFS_CUSTOM_VERSION
+endif
diff --git a/package/aufs/aufs.mk b/package/aufs/aufs.mk
new file mode 100644
index 0000000..c1b21c4
--- /dev/null
+++ b/package/aufs/aufs.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# aufs
+#
+################################################################################
+
+AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION))
+AUFS_LICENCSE = GPLv2
+AUFS_LICENSE_FILES = COPYING
+
+AUFS_SITE = http://git.code.sf.net/p/aufs/aufs3-standalone
+AUFS_SITE_METHOD = git
+
+AUFS_DEPENDENCIES = linux
+AUFS_INSTALL_STAGING = YES
+
+AUFS_PATCHES = kbuild base mmap standalone
+
+define AUFS_BUILD_CMDS
+    $(foreach p,$(AUFS_PATCHES),./support/scripts/apply-patches.sh $(LINUX_DIR) $(@D) *$(p).patch;)
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) aufs.ko
+endef
+
+define AUFS_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) -f scripts/Makefile.host \
+		scripts/unifdef
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) usr/include/linux/aufs_type.h
+	$(INSTALL) -p -m 0644 $(@D)/usr/include/linux/aufs_type.h \
+		$(STAGING_DIR)/usr/include/linux
+endef
+
+define AUFS_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) install
+endef
+
+$(eval $(generic-package))
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 2/2] aufs: initial release (selects aufs-utils)
  2014-07-28 19:26 ` [Buildroot] [PATCH 2/2] aufs: initial release (selects aufs-utils) steffenhoenig
@ 2014-07-28 19:49   ` Thomas De Schampheleire
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas De Schampheleire @ 2014-07-28 19:49 UTC (permalink / raw)
  To: buildroot

Hi Steffen,

steffenhoenig <s.hoenig@openthinclient.com> schreef:
>Signed-off-by: steffenhoenig <mail@steffenhoenig.com>

Thanks for your contribution.
May I ask to write your name as Steffen Hoenig, both in your email From line as in your Signed-off-by?

Thanks,
Thomas

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 2/2] aufs: initial release (selects aufs-utils)
  2014-07-28 19:34 ` [Buildroot] [PATCH 2/2] aufs: initial release (selects aufs-utils) steffenhoenig
@ 2014-11-23 20:54   ` Thomas Petazzoni
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2014-11-23 20:54 UTC (permalink / raw)
  To: buildroot

Hello Steffen,

Sorry for the very late feedback about your patches. Are you still
interested in getting aufs merged in Buildroot?

On Mon, 28 Jul 2014 21:34:25 +0200, steffenhoenig wrote:

> diff --git a/package/aufs/Config.in b/package/aufs/Config.in
> new file mode 100644
> index 0000000..e7842bd
> --- /dev/null
> +++ b/package/aufs/Config.in
> @@ -0,0 +1,36 @@
> +config BR2_PACKAGE_AUFS
> +        bool "aufs"
> +        select BR2_PACKAGE_AUFS_UTILS

Why do you select BR2_PACKAGE_AUFS_UTILS here? My understanding is that
the dependency is the other way around: you cannot build aufs-utils
until the aufs package has installed the aufs_type.h header file.

> +        help
> +          Aufs3 -- advanced multi layered unification filesystem version 3.x
> +
> +comment "aufs needs a Linux kernel to be built"
> +    depends on !BR2_LINUX_KERNEL

So there should be a "depends on BR2_LINUX_KERNEL" under the main aufs
config option, above.

> +
> +if BR2_PACKAGE_AUFS
> +
> +choice 
> +    prompt "version"
> +
> +config BR2_PACKAGE_AUFS_LATEST_VERSION
> +    bool "aufs3.15"
> +
> +config BR2_PACKAGE_AUFS_CUSTOM_VERSION
> +    bool "custom version"
> +    help
> +      This option allows to use a specific aufs kernel patch set
> +
> +      Note: you need to insert the version string like aufs3.12, aufs3.9, ...
> +
> +endchoice
> +
> +config BR2_PACKAGE_AUFS_CUSTOM_VERSION_VALUE
> +    string ""
> +    depends on BR2_PACKAGE_AUFS_CUSTOM_VERSION
> +
> +config BR2_PACKAGE_AUFS_VERSION
> +    string
> +    default "aufs3.15" if BR2_PACKAGE_AUFS_LATEST_VERSION
> +    default BR2_PACKAGE_AUFS_CUSTOM_VERSION_VALUE \
> +        if BR2_PACKAGE_AUFS_CUSTOM_VERSION
> +endif

I don't think this complexity is necessary. Having a "latest" version
for aufs doesn't make a lot of sense, because nobody wants the "latest"
version: everybody wants a version that matches the kernel version
being used.

So I believe, you can replace that by a single "string" config option:

config BR2_PACKAGE_AUFS_VERSION
	string "version"
	help
	  Specify aufs3.9, aufs3.13, aufs3.17 or any other existing
	  aufs version.

> +AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION))
> +AUFS_LICENCSE = GPLv2

LICENSE.

> +AUFS_LICENSE_FILES = COPYING
> +
> +AUFS_SITE = http://git.code.sf.net/p/aufs/aufs3-standalone
> +AUFS_SITE_METHOD = git
> +
> +AUFS_DEPENDENCIES = linux
> +AUFS_INSTALL_STAGING = YES
> +
> +AUFS_PATCHES = kbuild base mmap standalone
> +
> +define AUFS_BUILD_CMDS
> +    $(foreach p,$(AUFS_PATCHES),./support/scripts/apply-patches.sh $(LINUX_DIR) $(@D) *$(p).patch;)

This cannot work, because AUFS_BUILD_CMDS will be executed *after* the
Linux kernel has been built. So it's too late to patch the kernel.

Since aufs needs to patch the kernel, you'll have to handle it as a
"Linux kernel extension", taking example on what we've done for RTAI in
linux/linux-ext-rtai.mk. I can help with this, but before doing too
much work, I'd like to make sure you are still interested in aufs.

> +	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) aufs.ko
> +endef
> +
> +define AUFS_INSTALL_STAGING_CMDS
> +	$(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) -f scripts/Makefile.host \
> +		scripts/unifdef

Why?

> +	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) usr/include/linux/aufs_type.h

This should be part of AUFS_BUILD_CMDS.

> +	$(INSTALL) -p -m 0644 $(@D)/usr/include/linux/aufs_type.h \
> +		$(STAGING_DIR)/usr/include/linux
> +endef
> +
> +define AUFS_INSTALL_TARGET_CMDS
> +	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) install
> +endef
> +
> +$(eval $(generic-package))

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 2/2] aufs: initial release (selects aufs-utils)
  2014-07-28 19:34 [Buildroot] [PATCH 1/2] aufs-utils: initial release steffenhoenig
@ 2014-07-28 19:34 ` steffenhoenig
  2014-11-23 20:54   ` Thomas Petazzoni
  0 siblings, 1 reply; 4+ messages in thread
From: steffenhoenig @ 2014-07-28 19:34 UTC (permalink / raw)
  To: buildroot

Signed-off-by: steffenhoenig <mail@steffenhoenig.com>
---
 package/Config.in      |  1 +
 package/aufs/Config.in | 36 ++++++++++++++++++++++++++++++++++++
 package/aufs/aufs.mk   | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 package/aufs/Config.in
 create mode 100644 package/aufs/aufs.mk

diff --git a/package/Config.in b/package/Config.in
index b49908c..0225e9f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -136,6 +136,7 @@ endif
 endmenu
 
 menu "Filesystem and flash utilities"
+	source "package/aufs/Config.in"
 	source "package/aufs-utils/Config.in"
 	source "package/btrfs-progs/Config.in"
 	source "package/cifs-utils/Config.in"
diff --git a/package/aufs/Config.in b/package/aufs/Config.in
new file mode 100644
index 0000000..e7842bd
--- /dev/null
+++ b/package/aufs/Config.in
@@ -0,0 +1,36 @@
+config BR2_PACKAGE_AUFS
+        bool "aufs"
+        select BR2_PACKAGE_AUFS_UTILS
+        help
+          Aufs3 -- advanced multi layered unification filesystem version 3.x
+
+comment "aufs needs a Linux kernel to be built"
+    depends on !BR2_LINUX_KERNEL
+
+if BR2_PACKAGE_AUFS
+
+choice 
+    prompt "version"
+
+config BR2_PACKAGE_AUFS_LATEST_VERSION
+    bool "aufs3.15"
+
+config BR2_PACKAGE_AUFS_CUSTOM_VERSION
+    bool "custom version"
+    help
+      This option allows to use a specific aufs kernel patch set
+
+      Note: you need to insert the version string like aufs3.12, aufs3.9, ...
+
+endchoice
+
+config BR2_PACKAGE_AUFS_CUSTOM_VERSION_VALUE
+    string ""
+    depends on BR2_PACKAGE_AUFS_CUSTOM_VERSION
+
+config BR2_PACKAGE_AUFS_VERSION
+    string
+    default "aufs3.15" if BR2_PACKAGE_AUFS_LATEST_VERSION
+    default BR2_PACKAGE_AUFS_CUSTOM_VERSION_VALUE \
+        if BR2_PACKAGE_AUFS_CUSTOM_VERSION
+endif
diff --git a/package/aufs/aufs.mk b/package/aufs/aufs.mk
new file mode 100644
index 0000000..c1b21c4
--- /dev/null
+++ b/package/aufs/aufs.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# aufs
+#
+################################################################################
+
+AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION))
+AUFS_LICENCSE = GPLv2
+AUFS_LICENSE_FILES = COPYING
+
+AUFS_SITE = http://git.code.sf.net/p/aufs/aufs3-standalone
+AUFS_SITE_METHOD = git
+
+AUFS_DEPENDENCIES = linux
+AUFS_INSTALL_STAGING = YES
+
+AUFS_PATCHES = kbuild base mmap standalone
+
+define AUFS_BUILD_CMDS
+    $(foreach p,$(AUFS_PATCHES),./support/scripts/apply-patches.sh $(LINUX_DIR) $(@D) *$(p).patch;)
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) aufs.ko
+endef
+
+define AUFS_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(LINUX_DIR) $(LINUX_MAKE_FLAGS) -f scripts/Makefile.host \
+		scripts/unifdef
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) usr/include/linux/aufs_type.h
+	$(INSTALL) -p -m 0644 $(@D)/usr/include/linux/aufs_type.h \
+		$(STAGING_DIR)/usr/include/linux
+endef
+
+define AUFS_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) install
+endef
+
+$(eval $(generic-package))
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-11-23 20:54 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1406575604-19545-1-git-send-email-mail@steffenhoenig.com>
2014-07-28 19:26 ` [Buildroot] [PATCH 2/2] aufs: initial release (selects aufs-utils) steffenhoenig
2014-07-28 19:49   ` Thomas De Schampheleire
2014-07-28 19:34 [Buildroot] [PATCH 1/2] aufs-utils: initial release steffenhoenig
2014-07-28 19:34 ` [Buildroot] [PATCH 2/2] aufs: initial release (selects aufs-utils) steffenhoenig
2014-11-23 20:54   ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.