diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /poky/meta/recipes-devtools/apt/files/no-curl.patch | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/recipes-devtools/apt/files/no-curl.patch')
-rw-r--r-- | poky/meta/recipes-devtools/apt/files/no-curl.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/poky/meta/recipes-devtools/apt/files/no-curl.patch b/poky/meta/recipes-devtools/apt/files/no-curl.patch deleted file mode 100644 index 0838552b2..000000000 --- a/poky/meta/recipes-devtools/apt/files/no-curl.patch +++ /dev/null @@ -1,54 +0,0 @@ -Upstream-Status: Inappropriate [configuration] -From 5d61ac822fd9a3871cd5089389c210606232ecdc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> -Date: Thu, 26 May 2016 15:34:45 -0500 -Subject: [PATCH] Upstream-Status: Inappropriate [configuration] -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> ---- - configure.ac | 7 ------- - methods/makefile | 7 ------- - 2 files changed, 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e47f459..cd24264 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -83,13 +83,6 @@ AC_CHECK_HEADER(db.h, - - LIBS="$saveLIBS" - --AC_CHECK_LIB(curl, curl_easy_init, -- [AC_CHECK_HEADER(curl/curl.h, -- curl_ok=yes, -- curl_ok=no)], -- AC_MSG_ERROR([failed: I need CURL due https support]), --) -- - AC_SUBST(BDBLIB) - - HAVE_ZLIB=no -diff --git a/methods/makefile b/methods/makefile -index 3274e92..255086b 100644 ---- a/methods/makefile -+++ b/methods/makefile -@@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile - SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc server.cc - include $(PROGRAM_H) - --# The https method --PROGRAM=https --SLIBS = -lapt-pkg -lcurl $(INTLLIBS) -lresolv --LIB_MAKES = apt-pkg/makefile --SOURCE = https.cc server.cc --include $(PROGRAM_H) -- - # The ftp method - PROGRAM=ftp - SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) -lresolv --- -2.1.4 - |