Skip to contentSkip to conversation

Bump berkeleydb version

PATCH New Maxime Hadjinlian 3 participants 6 messages Apr 25, 2012

lore
Share & tools
lore

Maxime Hadjinlian

author
#0 lore raw

PATCH 1/2 Bump berkeleydb version

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/berkeleydb/berkeleydb.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
package/berkeleydb/berkeleydb.mk +1 -2
index ed70486..3d57852 100644
@@ -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) \
Signature · 1 line
1.7.10
author
#1 lore raw

PATCH 2/2 Add Netatalk

This patch add the Netatalk package to Buildroot.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 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
package/Config.in +1 -0
index 5ae1c81..7c19ed9 100644
@@ -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"
package/netatalk/Config.in new file +10 -0
new file mode 100644
index 0000000..1459246
@@ -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/
package/netatalk/S50netatalk new file +44 -0

44 lines not on this page · raw message

package/netatalk/netatalk.mk new file +31 -0
new file mode 100644
index 0000000..786721f
@@ -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))
Signature · 1 line
1.7.10
#2 lore raw

PATCH 2/2 Add Netatalk

Hi,

Le 25/04/2012 14:01, Maxime Hadjinlian a ?crit :

Quoted 31 lines

This patch add the Netatalk package to Buildroot.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 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
package/Config.in +1 -0
index 5ae1c81..7c19ed9 100644
@@ -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"
package/netatalk/Config.in new file +0 -0
new file mode 100644
index 0000000..1459246

package/netatalk/Config.in line 9

Quoted 9 lines
package/netatalk/Config.in new file +9 -0
@@ -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

Quoted 7 lines
package/netatalk/Config.in new file +1 -0
+	  http://netatalk.sourceforge.net/
package/netatalk/S50netatalk new file +0 -0
new file mode 100755
index 0000000..89dd214

package/netatalk/S50netatalk line 9

Quoted 9 lines
package/netatalk/S50netatalk new file +9 -0
@@ -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

package/netatalk/S50netatalk line 24

Quoted 13 lines
package/netatalk/S50netatalk new file +13 -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

I guess you mean start() here right ?

package/netatalk/S50netatalk line 33

Quoted 9 lines
package/netatalk/S50netatalk new file +9 -0
+        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 ? :)

package/netatalk/S50netatalk line 36

Quoted 3 lines
package/netatalk/S50netatalk new file +3 -0
+    restart)
+        netatalk_start()
+        netatalk_stop()

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

Quoted 18 lines
package/netatalk/S50netatalk new file +7 -0
+    ;; 
+    *) 
+        echo $"Usage: $0 {start|stop|restart}"
+        exit 1
+esac
+
+exit $?
package/netatalk/netatalk.mk new file +5 -0
new file mode 100644
index 0000000..786721f
@@ -0,0 +1,31 @@
+#############################################################
+#
+# netatalk
+#
+#############################################################

package/netatalk/netatalk.mk line 15

Quoted 10 lines
package/netatalk/netatalk.mk new file +10 -0
+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

Quoted 6 lines
package/netatalk/netatalk.mk new file +6 -0
+	--disable-zeroconf \
+	--with-ssl-dir=$(STAGING_DIR)/usr \
+	--with-libgcrypt-dir=$(STAGING_DIR)/usr \
+	--with-shadow \
+	--disable-shell-check \
+	--without-pam

package/netatalk/netatalk.mk line 31

Quoted 10 lines
package/netatalk/netatalk.mk new file +10 -0
+
+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

Signature · 4 lines
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH 1/2 Bump berkeleydb version

In reply to Maxime Hadjinlian

Hi,

Le 25/04/2012 14:01, Maxime Hadjinlian a ?crit :

Quoted 19 lines
Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/berkeleydb/berkeleydb.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
package/berkeleydb/berkeleydb.mk +1 -1
index ed70486..3d57852 100644
@@ -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

package/berkeleydb/berkeleydb.mk define BERKELEYDB_CONFIGURE_CMDS · line 36

Quoted 4 lines
package/berkeleydb/berkeleydb.mk +0 -1
@@ -33,7 +33,6 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--with-gnu-ld \
 		--disable-cxx \
 		--disable-java \
-		--disable-rpc \

Why do you need it enabled ?

package/berkeleydb/berkeleydb.mk define BERKELEYDB_CONFIGURE_CMDS · line 38

Quoted 3 lines
package/berkeleydb/berkeleydb.mk +0 -0
 		--disable-tcl \
 		--disable-compat185 \
 		$(SHARED_STATIC_LIBS_OPTS) \

Thanks,
Maxime

Signature · 4 lines
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#4 lore raw

PATCH 1/2 Bump berkeleydb version

Hi

Quoted 20 lines · Maxime Ripard

Hi,

Le 25/04/2012 14:01, Maxime Hadjinlian a ?crit :

Quoted 17 lines
Signed-off-by Maxime Hadjinlian <[email protected]>

---
?package/berkeleydb/berkeleydb.mk | ? ?3 +--
?1 file changed, 1 insertion(+), 2 deletions(-)

package/berkeleydb/berkeleydb.mk +0 -0
index ed70486..3d57852 100644
@@ -3,7 +3,7 @@

?# berkeley db
?# ?#############################################################

package/berkeleydb/berkeleydb.mk +1 -1
-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

Quoted 8 lines

package/berkeleydb/berkeleydb.mk define BERKELEYDB_CONFIGURE_CMDS · line 36

Quoted 6 lines

?BERKELEYDB_SUBDIR=build_unix

package/berkeleydb/berkeleydb.mk +0 -1
@@ -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 :)

Quoted 13 lines

package/berkeleydb/berkeleydb.mk define BERKELEYDB_CONFIGURE_CMDS · line 38

Quoted 4 lines
package/berkeleydb/berkeleydb.mk +0 -0
 ? ? ? ? ? ? ? --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