Skip to contentSkip to conversation

package/daemon: bump to version 0.7

PATCH New Baruch Siach 2 participants 4 messages Nov 21, 2020 – Dec 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/daemon: bump to version 0.7

The configure script now runs 'make ready'. Drop it from BUILD_CMDS.

Refresh the musl support path.

Upstream now provides sha256 hashes. Format hashes with two spaces.

---
 package/daemon/0001-fix-musl.patch | 4 ++--
 package/daemon/daemon.hash         | 7 +++----
 package/daemon/daemon.mk           | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)
package/daemon/0001-fix-musl.patch +2 -2
index 9454d72ae635..5ebb645973f0 100644
@@ -8,11 +8,11 @@ Signed-off-by: Baruch Siach <[email protected]>
 diff -Nuar daemon-0.6.4-orig/daemon.c daemon-0.6.4/daemon.c
 --- daemon-0.6.4-orig/daemon.c	2010-06-12 16:37:00.000000000 +0300
 +++ daemon-0.6.4/daemon.c	2017-05-01 22:02:17.721413468 +0300
-@@ -665,6 +665,7 @@
+@@ -864,6 +864,7 @@
  #ifdef _RESTORE_POSIX_SOURCE
  #define _POSIX_SOURCE
  #endif
 +#include <sys/ttydefaults.h>
+ #include <dirent.h>
  #include <sys/wait.h>
  #include <sys/stat.h>
- #include <sys/select.h>
package/daemon/daemon.hash +3 -4
index ad8637ee81f9..b1c1dcdc2c5d 100644
@@ -1,4 +1,3 @@
-# md5 from http://www.libslack.org/daemon/; sha256 locally calculated
-md5 6cd0a28630a29ac279bc501f39baec66 daemon-0.6.4.tar.gz
-sha256 c4b9ea4aa74d55ea618c34f1e02c080ddf368549037cb239ee60c83191035ca1 daemon-0.6.4.tar.gz
-sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE
+# From http://www.libslack.org/daemon/
+sha256  f66af2ece784c16dcb5219de1f4fa3ae5787bb3374e44bd4b1d3e275e8ff272c  daemon-0.7.tar.gz
+sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  LICENSE
package/daemon/daemon.mk +2 -3
index 79cf3f7aab74..f3a1917fadc1 100644
@@ -4,17 +4,16 @@
 #
 ################################################################################
 
-DAEMON_VERSION = 0.6.4
+DAEMON_VERSION = 0.7
 DAEMON_SITE = http://libslack.org/daemon/download
 DAEMON_LICENSE = GPL-2.0+
 DAEMON_LICENSE_FILES = LICENSE
 
 define DAEMON_CONFIGURE_CMDS
-	(cd $(@D); ./config)
+	(cd $(@D); ./configure)
 endef
 
 define DAEMON_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) ready
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
 endef
 
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/daemon: bump to version 0.7

Hello Baruch,

Quoted 7 lines · On Sat, 21 Nov 2020 19:50:54 +0200 Baruch Siach <[email protected]> wrote:

The configure script now runs 'make ready'. Drop it from BUILD_CMDS.

Refresh the musl support path.

Upstream now provides sha256 hashes. Format hashes with two spaces.

I have applied, but I have one question, see below.

package/daemon/daemon.mk line 13

Quoted 3 lines

define DAEMON_CONFIGURE_CMDS

package/daemon/daemon.mk +1 -1
-	(cd $(@D); ./config)
+	(cd $(@D); ./configure)

What is the config/configure script doing? Indeed, it seems odd that when cross-compiling, we don't need to pass it the cross-compiler/cross-linker/CFLAGS, etc. ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/daemon: bump to version 0.7

Hi Thomas,

Quoted 9 lines · Thomas Petazzoni

package/daemon/daemon.mk line 13

Quoted 3 lines · On Sat, 21 Nov 2020 19:50:54 +0200 Baruch Siach <[email protected]> wrote:

define DAEMON_CONFIGURE_CMDS

package/daemon/daemon.mk +1 -1
-	(cd $(@D); ./config)
+	(cd $(@D); ./configure)

What is the config/configure script doing? Indeed, it seems odd that when cross-compiling, we don't need to pass it the cross-compiler/cross-linker/CFLAGS, etc. ?

This script does only this:

case "uname -a" in

        Linux*)
                echo "Configuring for linux"
                conf/linux
                ;;

...

The conf/linux script modifies a few Makefiles and headers for generic Linux build. Nothing architecture specific. This works because we assume that host and target are both Linux.

baruch

Signature · 3 lines
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#3 lore raw

PATCH 1/1 package/daemon: bump to version 0.7

Quoted 7 lines · On Tue, 08 Dec 2020 07:44:22 +0200 Baruch Siach <[email protected]> wrote:

This script does only this:

case "uname -a" in

        Linux*)
                echo "Configuring for linux"
                conf/linux
                ;;
Quoted 5 lines

...

The conf/linux script modifies a few Makefiles and headers for generic Linux build. Nothing architecture specific. This works because we assume that host and target are both Linux.

Alright, thanks for confirming!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com