All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Fischer <mf@go-sys.de>
To: <buildroot@busybox.net>
Cc: Michael Fischer <mf@go-sys.de>,
	Denys Vlasenko <vda.linux@googlemail.com>
Subject: [Buildroot] [PATCH 1/1] package/busybox: bump version to 1.34.1
Date: Mon, 1 Nov 2021 11:12:17 +0100	[thread overview]
Message-ID: <20211101101217.23328-1-mf@go-sys.de> (raw)

patch 0003: already applied upstream

Signed-off-by: Michael Fischer <mf@go-sys.de>
---
 ...003-udhcp-fix-build-breakage-on-MIPS.patch | 39 -------------------
 package/busybox/busybox.hash                  |  4 +-
 package/busybox/busybox.mk                    |  2 +-
 3 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch

diff --git a/package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch b/package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch
deleted file mode 100644
index d54d45da43..0000000000
--- a/package/busybox/0003-udhcp-fix-build-breakage-on-MIPS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 56824284b749e5b9d568b75d5c5bc471b1814d46 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Fri, 20 Aug 2021 13:33:50 +0200
-Subject: [PATCH] udhcp: fix build breakage on MIPS
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
----
-upstream status: 00adcdb64 ("udhcp: fix build breakage on MIPS")
-
- networking/udhcp/common.h | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
-index 8c678dd32..ca778dab8 100644
---- a/networking/udhcp/common.h
-+++ b/networking/udhcp/common.h
-@@ -304,18 +304,6 @@ void udhcp_dump_packet(struct dhcp_packet *packet) FAST_FUNC;
- # define log3s(msg) ((void)0)
- #endif
-
--#if defined(__mips__)
--/*
-- * The 'simple' message functions have a negative impact on the size of the
-- * DHCP code when compiled for MIPS, so don't use them in this case.
-- */
--#define bb_simple_info_msg bb_info_msg
--#define bb_simple_error_msg bb_error_msg
--#define bb_simple_perror_msg_and_die bb_perror_msg_and_die
--#undef log1s
--#define log1s log1
--#endif
--
- /*** Other shared functions ***/
-
- /* 2nd param is "uint32_t*" */
---
-2.33.0
-
diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash
index 4782f68819..1f34651d7b 100644
--- a/package/busybox/busybox.hash
+++ b/package/busybox/busybox.hash
@@ -1,5 +1,5 @@
-# From https://busybox.net/downloads/busybox-1.34.0.tar.bz2.sha256
-sha256  ec8d1615edb045b83b81966604759c4d4ac921434ab4011da604f629c06074ce  busybox-1.34.0.tar.bz2
+# From https://busybox.net/downloads/busybox-1.34.1.tar.bz2.sha256
+sha256  415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549  busybox-1.34.1.tar.bz2
 # Locally computed
 sha256  bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548  LICENSE
 sha256  b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f  archival/libarchive/bz/LICENSE
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 08b5c55c50..3523cf21d0 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BUSYBOX_VERSION = 1.34.0
+BUSYBOX_VERSION = 1.34.1
 BUSYBOX_SITE = https://www.busybox.net/downloads
 BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2021-11-01 10:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-01 10:12 Michael Fischer [this message]
2021-11-01 17:06 ` [Buildroot] [PATCH 1/1] package/busybox: bump version to 1.34.1 Petr Vorel
2021-11-03 21:50 ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211101101217.23328-1-mf@go-sys.de \
    --to=mf@go-sys.de \
    --cc=buildroot@busybox.net \
    --cc=vda.linux@googlemail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.