mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
Revert "apt: runtime error: filename too long (tmpdir length)"
This reverts commit dafdf9bb9e9d944b9f455c2be8cf698496200717. Patch rejected upstream (From OE-Core rev: e0e9fe4efceb927cfe643b4566bca0b7bfd166fb) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
@@ -1,40 +0,0 @@
|
||||
From 918295aa1320718d342116f76c98d2289d377800 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Tue, 18 Jun 2024 10:32:55 +0800
|
||||
Subject: [PATCH] strutl.cc: the filename can't be longer than 255
|
||||
|
||||
The URItoFileName translates the path into the filename, but the
|
||||
filename can't be longer than 255 according to
|
||||
/usr/include/linux/limits.h.
|
||||
|
||||
Truncate it when it is longer than 240 (leave some spaces for
|
||||
".Packages" and "._Release" suffix)
|
||||
|
||||
Upstream-Status: Submitted [https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1073591]
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
apt-pkg/contrib/strutl.cc | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
|
||||
index 67100f1..5076b35 100644
|
||||
--- a/apt-pkg/contrib/strutl.cc
|
||||
+++ b/apt-pkg/contrib/strutl.cc
|
||||
@@ -565,7 +565,12 @@ string URItoFileName(const string &URI)
|
||||
// "\x00-\x20{}|\\\\^\\[\\]<>\"\x7F-\xFF";
|
||||
string NewURI = QuoteString(U,"\\|{}[]<>\"^~_=!@#$%^&*");
|
||||
replace(NewURI.begin(),NewURI.end(),'/','_');
|
||||
- return NewURI;
|
||||
+
|
||||
+ // Truncate from the head when it is longer than 240
|
||||
+ if(NewURI.length() > 240)
|
||||
+ return NewURI.substr(NewURI.length() - 240, NewURI.length() - 1);
|
||||
+ else
|
||||
+ return NewURI;
|
||||
}
|
||||
/*}}}*/
|
||||
// Base64Encode - Base64 Encoding routine for short strings /*{{{*/
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -14,7 +14,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
|
||||
file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \
|
||||
file://0001-aptwebserver.cc-Include-array.patch \
|
||||
file://0001-Remove-using-std-binary_function.patch \
|
||||
file://0001-strutl.cc-the-filename-can-t-be-longer-than-255.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-native = " \
|
||||
|
||||
Reference in New Issue
Block a user