From 04cc6d470a506c86ba44ae50aad884c0018ab96f Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 15 Feb 2017 19:22:52 +0100 Subject: [PATCH] morty migration: busybox: update package https://jira.digi.com/browse/DEL-3451 Signed-off-by: Javier Viguera --- .../0001-del-baudrates.patch | 0 .../0002-del-flash_eraseall.patch | 4 ++-- ...indefinitely-try-to-resolve-peer-addresses.patch | 8 ++++---- .../{busybox-1.23.2 => busybox-1.24.1}/acpid.map | 0 .../bridgeifupdown | 0 .../busybox-acpid | 0 .../{busybox-1.23.2 => busybox-1.24.1}/busybox-ntpd | 0 .../busybox-static-nodes | 0 .../ccimx6ul/acpid.map | 0 .../ccimx6ul/suspend | 0 .../{busybox-1.23.2 => busybox-1.24.1}/defconfig | 0 .../digi-logo.png | Bin .../{busybox-1.23.2 => busybox-1.24.1}/index.html | 0 .../pswitch-poweroff | 0 .../pswitch-suspend | 0 .../{busybox-1.23.2 => busybox-1.24.1}/suspend | 0 ...ybox_1.23.2.bbappend => busybox_1.24.1.bbappend} | 0 17 files changed, 6 insertions(+), 6 deletions(-) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/0001-del-baudrates.patch (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/0002-del-flash_eraseall.patch (96%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch (91%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/acpid.map (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/bridgeifupdown (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/busybox-acpid (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/busybox-ntpd (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/busybox-static-nodes (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/ccimx6ul/acpid.map (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/ccimx6ul/suspend (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/defconfig (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/digi-logo.png (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/index.html (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/pswitch-poweroff (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/pswitch-suspend (100%) rename meta-digi-dey/recipes-core/busybox/{busybox-1.23.2 => busybox-1.24.1}/suspend (100%) rename meta-digi-dey/recipes-core/busybox/{busybox_1.23.2.bbappend => busybox_1.24.1.bbappend} (100%) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/0001-del-baudrates.patch b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0001-del-baudrates.patch similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/0001-del-baudrates.patch rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0001-del-baudrates.patch diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/0002-del-flash_eraseall.patch b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0002-del-flash_eraseall.patch similarity index 96% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/0002-del-flash_eraseall.patch rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0002-del-flash_eraseall.patch index 9b9e7511f..d69a4ad2d 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/0002-del-flash_eraseall.patch +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0002-del-flash_eraseall.patch @@ -18,10 +18,10 @@ Signed-off-by: Javier Viguera 2 files changed, 17 insertions(+) diff --git a/Makefile.flags b/Makefile.flags -index 307afa7..feeeb7d 100644 +index 9f77674..fdbaad8 100644 --- a/Makefile.flags +++ b/Makefile.flags -@@ -152,6 +152,10 @@ ifeq ($(CONFIG_DMALLOC),y) +@@ -159,6 +159,10 @@ ifeq ($(CONFIG_DMALLOC),y) LDLIBS += dmalloc endif diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch similarity index 91% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch index d93c04753..d61f404c9 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/0003-ntpd-indefinitely-try-to-resolve-peer-addresses.patch @@ -14,10 +14,10 @@ Conflicts: 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/networking/ntpd.c b/networking/ntpd.c -index 2d4f076..7e8f3f1 100644 +index 9732c9b..89421e5 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c -@@ -251,6 +251,7 @@ typedef struct { +@@ -265,6 +265,7 @@ typedef struct { typedef struct { len_and_sockaddr *p_lsa; char *p_dotted; @@ -25,7 +25,7 @@ index 2d4f076..7e8f3f1 100644 int p_fd; int datapoint_idx; uint32_t lastpkt_refid; -@@ -756,8 +757,9 @@ add_peers(const char *s) +@@ -766,8 +767,9 @@ add_peers(const char *s) peer_t *p; p = xzalloc(sizeof(*p)); @@ -37,7 +37,7 @@ index 2d4f076..7e8f3f1 100644 p->p_fd = -1; p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3); p->next_action_time = G.cur_time; /* = set_next(p, 0); */ -@@ -806,6 +808,25 @@ send_query_to_peer(peer_t *p) +@@ -816,6 +818,25 @@ send_query_to_peer(peer_t *p) * * Uncomment this and use strace to see it in action: */ diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/acpid.map b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/acpid.map similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/acpid.map rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/acpid.map diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/bridgeifupdown b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/bridgeifupdown similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/bridgeifupdown rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/bridgeifupdown diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/busybox-acpid b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/busybox-acpid similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/busybox-acpid rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/busybox-acpid diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/busybox-ntpd b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/busybox-ntpd similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/busybox-ntpd rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/busybox-ntpd diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/busybox-static-nodes b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/busybox-static-nodes similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/busybox-static-nodes rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/busybox-static-nodes diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/acpid.map b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/acpid.map similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/acpid.map rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/acpid.map diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/ccimx6ul/suspend diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/defconfig b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/defconfig rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/digi-logo.png b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/digi-logo.png similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/digi-logo.png rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/digi-logo.png diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/index.html b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/index.html similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/index.html rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/index.html diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-poweroff b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/pswitch-poweroff similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-poweroff rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/pswitch-poweroff diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/pswitch-suspend similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/pswitch-suspend rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/pswitch-suspend diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.24.1/suspend similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox-1.23.2/suspend rename to meta-digi-dey/recipes-core/busybox/busybox-1.24.1/suspend diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.24.1.bbappend similarity index 100% rename from meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend rename to meta-digi-dey/recipes-core/busybox/busybox_1.24.1.bbappend