[Buildroot] [PATCH 1/2] Bump berkeleydb version

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 1/2] Bump berkeleydb version
@ 2012-04-25 12:01 Maxime Hadjinlian
  2012-04-25 12:01 ` [Buildroot] [PATCH 2/2] Add Netatalk Maxime Hadjinlian
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Maxime Hadjinlian @ 2012-04-25 12:01 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
 package/berkeleydb/berkeleydb.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index ed70486..3d57852 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -3,7 +3,7 @@
 # berkeley db
 #
 #############################################################
-BERKELEYDB_VERSION:=4.4.20
+BERKELEYDB_VERSION:=5.3.15
 BERKELEYDB_SITE:=http://download.oracle.com/berkeley-db
 BERKELEYDB_SOURCE:=db-$(BERKELEYDB_VERSION).NC.tar.gz
 BERKELEYDB_SUBDIR=build_unix
@@ -33,7 +33,6 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--with-gnu-ld \
 		--disable-cxx \
 		--disable-java \
-		--disable-rpc \
 		--disable-tcl \
 		--disable-compat185 \
 		$(SHARED_STATIC_LIBS_OPTS) \
-- 
1.7.10

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

* [Buildroot] [PATCH 2/2] Add Netatalk
  2012-04-25 12:01 [Buildroot] [PATCH 1/2] Bump berkeleydb version Maxime Hadjinlian
@ 2012-04-25 12:01 ` Maxime Hadjinlian
  2012-04-25 12:25   ` Maxime Ripard
  2012-04-25 12:13 ` [Buildroot] [PATCH 1/2] Bump berkeleydb version Maxime Ripard
  2012-04-25 13:34 ` Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Maxime Hadjinlian @ 2012-04-25 12:01 UTC (permalink / raw)
  To: buildroot

This patch add the Netatalk package to Buildroot.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
 package/Config.in            |    1 +
 package/netatalk/Config.in   |   10 ++++++++++
 package/netatalk/S50netatalk |   44 ++++++++++++++++++++++++++++++++++++++++++
 package/netatalk/netatalk.mk |   31 +++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 package/netatalk/Config.in
 create mode 100755 package/netatalk/S50netatalk
 create mode 100644 package/netatalk/netatalk.mk

diff --git a/package/Config.in b/package/Config.in
index 5ae1c81..7c19ed9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -487,6 +487,7 @@ source "package/netcat/Config.in"
 source "package/netkitbase/Config.in"
 source "package/netkittelnet/Config.in"
 endif
+source "package/netatalk/Config.in"
 source "package/netplug/Config.in"
 source "package/netsnmp/Config.in"
 source "package/netstat-nat/Config.in"
diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in
new file mode 100644
index 0000000..1459246
--- /dev/null
+++ b/package/netatalk/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_NETATALK
+	bool "netatalk"
+	select BR2_PACKAGE_BERKELEYDB
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_LIBGPG_ERROR
+	help
+	  Netatalk can be used to turn a *NIX machine into an extremely 
+	  high-performance and reliable file server for Macintosh computers.
+	  http://netatalk.sourceforge.net/
diff --git a/package/netatalk/S50netatalk b/package/netatalk/S50netatalk
new file mode 100755
index 0000000..89dd214
--- /dev/null
+++ b/package/netatalk/S50netatalk
@@ -0,0 +1,44 @@
+#!/bin/sh 
+# 
+# Start netatalk daemon  (aftpd && cnid_metad)
+#
+
+# Guard to prevent execution if netatalk was removed.
+test -x /usr/sbin/afpd || exit 0
+test -x /usr/sbin/cnid_metad || exit 0
+
+AFPD_UAMLIST="-U uams_dhx2.so,uams_clrtxt.so"
+
+netatalk_start() {
+    echo "Starting afpd"
+    # prepare startup of file services
+    echo -n " cnid_metad"
+    /usr/sbin/cnid_metad -l log_note
+    /usr/sbin/afpd $AFPD_UAMLIST -g nobody -c 50
+    echo -n " afpd"
+}
+
+case "$1" in
+    start)
+        echo -n "Starting Netatalk services (this will take a while): "
+        netatalk_startup
+        echo "."
+    ;; 
+    stop)
+        echo -n "Stopping Netatalk Daemons:"
+        echo -n " afpd"
+        start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/afpd
+        echo -n " cnid_metad"
+        start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/cnid_metad
+    ;; 
+    restart)
+        netatalk_start()
+        netatalk_stop()
+    ;; 
+    *) 
+        echo $"Usage: $0 {start|stop|restart}"
+        exit 1
+esac
+
+exit $?
+
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
new file mode 100644
index 0000000..786721f
--- /dev/null
+++ b/package/netatalk/netatalk.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# netatalk
+#
+#############################################################
+NETATALK_VERSION = 2.2.2
+NETATALK_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/netatalk/netatalk/$(NETATALK_VERSION)/
+NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
+
+NETALATK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
+NETATALK_CONF_OPT += --sysconfdir=/etc \
+	--with-cnid-cdb-backend \
+	--disable-cups \
+	--with-bdb=$(STAGING_DIR)/usr \
+	--disable-cups \
+	--disable-zeroconf \
+	--with-ssl-dir=$(STAGING_DIR)/usr \
+	--with-libgcrypt-dir=$(STAGING_DIR)/usr \
+	--with-shadow \
+	--disable-shell-check \
+	--without-pam
+
+define NETATALK_INSTALL_EXTRA_FILES
+	[ -f $(TARGET_DIR)/etc/init.d/S50netatalk ] || \
+		$(INSTALL) -m 0755 -D package/netatalk/S50netatalk \
+			$(TARGET_DIR)/etc/init.d/S50netatalk
+endef
+
+NETATALK_POST_INSTALL_TARGET_HOOKS += NETATALK_INSTALL_EXTRA_FILES
+
+$(eval $(call AUTOTARGETS))
-- 
1.7.10

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

* [Buildroot] [PATCH 2/2] Add Netatalk
  2012-04-25 12:01 ` [Buildroot] [PATCH 2/2] Add Netatalk Maxime Hadjinlian
@ 2012-04-25 12:25   ` Maxime Ripard
  0 siblings, 0 replies; 6+ messages in thread
From: Maxime Ripard @ 2012-04-25 12:25 UTC (permalink / raw)
  To: buildroot

Hi,

Le 25/04/2012 14:01, Maxime Hadjinlian a ?crit :
> This patch add the Netatalk package to Buildroot.
> 
> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> ---
>  package/Config.in            |    1 +
>  package/netatalk/Config.in   |   10 ++++++++++
>  package/netatalk/S50netatalk |   44 ++++++++++++++++++++++++++++++++++++++++++
>  package/netatalk/netatalk.mk |   31 +++++++++++++++++++++++++++++
>  4 files changed, 86 insertions(+)
>  create mode 100644 package/netatalk/Config.in
>  create mode 100755 package/netatalk/S50netatalk
>  create mode 100644 package/netatalk/netatalk.mk
> 
> diff --git a/package/Config.in b/package/Config.in
> index 5ae1c81..7c19ed9 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -487,6 +487,7 @@ source "package/netcat/Config.in"
>  source "package/netkitbase/Config.in"
>  source "package/netkittelnet/Config.in"
>  endif
> +source "package/netatalk/Config.in"
>  source "package/netplug/Config.in"
>  source "package/netsnmp/Config.in"
>  source "package/netstat-nat/Config.in"
> diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in
> new file mode 100644
> index 0000000..1459246
> --- /dev/null
> +++ b/package/netatalk/Config.in
> @@ -0,0 +1,10 @@
> +config BR2_PACKAGE_NETATALK
> +	bool "netatalk"
> +	select BR2_PACKAGE_BERKELEYDB
> +	select BR2_PACKAGE_OPENSSL
> +	select BR2_PACKAGE_LIBGCRYPT
> +	select BR2_PACKAGE_LIBGPG_ERROR
> +	help
> +	  Netatalk can be used to turn a *NIX machine into an extremely 
> +	  high-performance and reliable file server for Macintosh computers.

You need to add an extra line here

> +	  http://netatalk.sourceforge.net/
> diff --git a/package/netatalk/S50netatalk b/package/netatalk/S50netatalk
> new file mode 100755
> index 0000000..89dd214
> --- /dev/null
> +++ b/package/netatalk/S50netatalk
> @@ -0,0 +1,44 @@
> +#!/bin/sh 
> +# 
> +# Start netatalk daemon  (aftpd && cnid_metad)
> +#
> +
> +# Guard to prevent execution if netatalk was removed.
> +test -x /usr/sbin/afpd || exit 0
> +test -x /usr/sbin/cnid_metad || exit 0
> +

Why do you need this ? I guess that if netatalk was removed from
buildroot, the script wouldn't be there in the first place

> +AFPD_UAMLIST="-U uams_dhx2.so,uams_clrtxt.so"
> +netatalk_start() {
> +    echo "Starting afpd"
> +    # prepare startup of file services
> +    echo -n " cnid_metad"
> +    /usr/sbin/cnid_metad -l log_note
> +    /usr/sbin/afpd $AFPD_UAMLIST -g nobody -c 50
> +    echo -n " afpd"
> +}
> +case "$1" in
> +    start)
> +        echo -n "Starting Netatalk services (this will take a while): "
> +        netatalk_startup

I guess you mean start() here right ?

> +        echo "."
> +    ;; 
> +    stop)
> +        echo -n "Stopping Netatalk Daemons:"
> +        echo -n " afpd"
> +        start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/afpd
> +        echo -n " cnid_metad"
> +        start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/cnid_metad
> +    ;; 

If you use start-stop-daemon in the stop function, why not use it as
well in the start function ? :)

> +    restart)
> +        netatalk_start()
> +        netatalk_stop()

I don't see this function defined neither...

> +    ;; 
> +    *) 
> +        echo $"Usage: $0 {start|stop|restart}"
> +        exit 1
> +esac
> +
> +exit $?
> diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
> new file mode 100644
> index 0000000..786721f
> --- /dev/null
> +++ b/package/netatalk/netatalk.mk
> @@ -0,0 +1,31 @@
> +#############################################################
> +#
> +# netatalk
> +#
> +#############################################################
> +NETATALK_VERSION = 2.2.2
> +NETATALK_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/netatalk/netatalk/$(NETATALK_VERSION)/
> +NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
> +
> +NETALATK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
> +NETATALK_CONF_OPT += --sysconfdir=/etc \
> +	--with-cnid-cdb-backend \
> +	--disable-cups \
> +	--with-bdb=$(STAGING_DIR)/usr \
> +	--disable-cups \

We do have cups in the packages too, so maybe we could add something like:
ifeq ($(BR2_PACKAGE_CUPS),y)
    NETATALK_DEPENDENCIES += cups
    NETATALK_CONF_OPT += --enable-cups
else
    NETATALK_CONF_OPT += --disable-cups
endif

> +	--disable-zeroconf \
> +	--with-ssl-dir=$(STAGING_DIR)/usr \
> +	--with-libgcrypt-dir=$(STAGING_DIR)/usr \
> +	--with-shadow \
> +	--disable-shell-check \
> +	--without-pam
> +
> +define NETATALK_INSTALL_EXTRA_FILES
> +	[ -f $(TARGET_DIR)/etc/init.d/S50netatalk ] || \
> +		$(INSTALL) -m 0755 -D package/netatalk/S50netatalk \
> +			$(TARGET_DIR)/etc/init.d/S50netatalk
> +endef
> +
> +NETATALK_POST_INSTALL_TARGET_HOOKS += NETATALK_INSTALL_EXTRA_FILES
> +
> +$(eval $(call AUTOTARGETS))

Thanks,
Maxime

-- 
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

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

* [Buildroot] [PATCH 1/2] Bump berkeleydb version
  2012-04-25 12:01 [Buildroot] [PATCH 1/2] Bump berkeleydb version Maxime Hadjinlian
  2012-04-25 12:01 ` [Buildroot] [PATCH 2/2] Add Netatalk Maxime Hadjinlian
@ 2012-04-25 12:13 ` Maxime Ripard
  2012-04-25 12:21   ` Maxime Hadjinlian
  2012-04-25 13:34 ` Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Maxime Ripard @ 2012-04-25 12:13 UTC (permalink / raw)
  To: buildroot

Hi,

Le 25/04/2012 14:01, Maxime Hadjinlian a ?crit :
> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> ---
>  package/berkeleydb/berkeleydb.mk |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
> index ed70486..3d57852 100644
> --- a/package/berkeleydb/berkeleydb.mk
> +++ b/package/berkeleydb/berkeleydb.mk
> @@ -3,7 +3,7 @@
>  # berkeley db
>  #
>  #############################################################
> -BERKELEYDB_VERSION:=4.4.20
> +BERKELEYDB_VERSION:=5.3.15
>  BERKELEYDB_SITE:=http://download.oracle.com/berkeley-db
>  BERKELEYDB_SOURCE:=db-$(BERKELEYDB_VERSION).NC.tar.gz
>  BERKELEYDB_SUBDIR=build_unix
> @@ -33,7 +33,6 @@ define BERKELEYDB_CONFIGURE_CMDS
>  		--with-gnu-ld \
>  		--disable-cxx \
>  		--disable-java \
> -		--disable-rpc \

Why do you need it enabled ?

>  		--disable-tcl \
>  		--disable-compat185 \
>  		$(SHARED_STATIC_LIBS_OPTS) \

Thanks,
Maxime

-- 
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

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

* [Buildroot] [PATCH 1/2] Bump berkeleydb version
  2012-04-25 12:13 ` [Buildroot] [PATCH 1/2] Bump berkeleydb version Maxime Ripard
@ 2012-04-25 12:21   ` Maxime Hadjinlian
  0 siblings, 0 replies; 6+ messages in thread
From: Maxime Hadjinlian @ 2012-04-25 12:21 UTC (permalink / raw)
  To: buildroot

Hi

On Wed, Apr 25, 2012 at 14:13, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi,
>
> Le 25/04/2012 14:01, Maxime Hadjinlian a ?crit :
>> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
>> ---
>> ?package/berkeleydb/berkeleydb.mk | ? ?3 +--
>> ?1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
>> index ed70486..3d57852 100644
>> --- a/package/berkeleydb/berkeleydb.mk
>> +++ b/package/berkeleydb/berkeleydb.mk
>> @@ -3,7 +3,7 @@
>> ?# berkeley db
>> ?#
>> ?#############################################################
>> -BERKELEYDB_VERSION:=4.4.20
>> +BERKELEYDB_VERSION:=5.3.15
>> ?BERKELEYDB_SITE:=http://download.oracle.com/berkeley-db
>> ?BERKELEYDB_SOURCE:=db-$(BERKELEYDB_VERSION).NC.tar.gz
>> ?BERKELEYDB_SUBDIR=build_unix
>> @@ -33,7 +33,6 @@ define BERKELEYDB_CONFIGURE_CMDS
>> ? ? ? ? ? ? ? --with-gnu-ld \
>> ? ? ? ? ? ? ? --disable-cxx \
>> ? ? ? ? ? ? ? --disable-java \
>> - ? ? ? ? ? ? --disable-rpc \
>
> Why do you need it enabled ?
The option was removed in the new version of BerkeleyDB :)
>
>> ? ? ? ? ? ? ? --disable-tcl \
>> ? ? ? ? ? ? ? --disable-compat185 \
>> ? ? ? ? ? ? ? $(SHARED_STATIC_LIBS_OPTS) \
>
> Thanks,
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Kernel, drivers, real-time and embedded Linux
> development, consulting, training and support.
> http://free-electrons.com

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

* [Buildroot] [PATCH 1/2] Bump berkeleydb version
  2012-04-25 12:01 [Buildroot] [PATCH 1/2] Bump berkeleydb version Maxime Hadjinlian
  2012-04-25 12:01 ` [Buildroot] [PATCH 2/2] Add Netatalk Maxime Hadjinlian
  2012-04-25 12:13 ` [Buildroot] [PATCH 1/2] Bump berkeleydb version Maxime Ripard
@ 2012-04-25 13:34 ` Peter Korsgaard
  2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2012-04-25 13:34 UTC (permalink / raw)
  To: buildroot

>>>>> "Maxime" == Maxime Hadjinlian <maxime.hadjinlian@gmail.com> writes:

 Maxime> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

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

end of thread, other threads:[~2012-04-25 13:34 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-25 12:01 [Buildroot] [PATCH 1/2] Bump berkeleydb version Maxime Hadjinlian
2012-04-25 12:01 ` [Buildroot] [PATCH 2/2] Add Netatalk Maxime Hadjinlian
2012-04-25 12:25   ` Maxime Ripard
2012-04-25 12:13 ` [Buildroot] [PATCH 1/2] Bump berkeleydb version Maxime Ripard
2012-04-25 12:21   ` Maxime Hadjinlian
2012-04-25 13:34 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox