From 0c8c7e865dd4be7e6e32182211fc0d1c8acdaab9 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 06 Apr 2019 13:00:20 -0400 Subject: patches: Apply sequentially --- (limited to 'patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch') diff --git a/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch b/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch index 9765026..7a35403 100644 --- a/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch +++ b/patches/0003-cli-Optionally-enforce-argument-to-upgrade-command.patch @@ -1,7 +1,7 @@ -From 8297cbe6f15ddef8bb47682913ff10a3cffa997c Mon Sep 17 00:00:00 2001 +From f96d300f0c236ebd4edb8e8b11aa948257cb7fb0 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Thu, 4 Apr 2019 18:25:51 -0400 -Subject: [PATCH] cli: Optionally enforce argument to upgrade command +Subject: [PATCH 3/6] cli: Optionally enforce argument to upgrade command This reverts and amends commit 673d7213175c2cf209b25c8eb2632941cdbb8519. @@ -13,10 +13,10 @@ Signed-off-by: Patrick McDermott 3 files changed, 25 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 26230b3..508eccc 100644 +index 9acd6b4..dfb1b81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -13,6 +13,7 @@ SET(VERSION "" CACHE STRING "Override version") +@@ -15,6 +15,7 @@ SET(VERSION "" CACHE STRING "Override version") OPTION(STATIC_UBOX "Statically link libubox" OFF) OPTION(BUILD_TESTS "Build test programs" ON) OPTION(ENABLE_USIGN "Enable usign support" ON) @@ -24,7 +24,7 @@ index 26230b3..508eccc 100644 IF(NOT HOST_CPU) SET(HOST_CPU "${CMAKE_HOST_SYSTEM_PROCESSOR}") -@@ -49,6 +50,9 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations +@@ -52,6 +53,9 @@ ADD_DEFINITIONS(-Os -Wall --std=gnu99 -g3 -Wmissing-declarations IF(ENABLE_USIGN) ADD_DEFINITIONS(-DHAVE_USIGN) ENDIF() @@ -71,7 +71,7 @@ index c823df8..0a4180d 100644 {"list", 0, (opkg_cmd_fun_t) opkg_list_cmd, PFM_SOURCE}, {"list_installed", 0, (opkg_cmd_fun_t) opkg_list_installed_cmd, diff --git a/src/opkg-cl.c b/src/opkg-cl.c -index a3ea5c1..29cd373 100644 +index a299514..6488e00 100644 --- a/src/opkg-cl.c +++ b/src/opkg-cl.c @@ -260,7 +260,11 @@ static void usage() -- cgit v0.9.1