| 1 |
commit: 53b7db9a742f6f917d3a65994fbdefd22cd89760 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 22 06:11:56 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 22 06:49:27 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b7db9a |
| 7 |
|
| 8 |
dev-util/sysdig: Drop old |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-util/sysdig/Manifest | 2 - |
| 13 |
.../sysdig/files/sysdig-0.26.0-build-fixes.patch | 52 ------------ |
| 14 |
dev-util/sysdig/sysdig-0.26.1.ebuild | 97 ---------------------- |
| 15 |
dev-util/sysdig/sysdig-0.26.2.ebuild | 88 -------------------- |
| 16 |
4 files changed, 239 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest |
| 19 |
index c9294446013..1bc4bb1ee5e 100644 |
| 20 |
--- a/dev-util/sysdig/Manifest |
| 21 |
+++ b/dev-util/sysdig/Manifest |
| 22 |
@@ -1,4 +1,2 @@ |
| 23 |
-DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb |
| 24 |
-DIST sysdig-0.26.2.tar.gz 907496 BLAKE2B ce489d7c1a54aa2930599aa7141b1a3d4815c0395b4a444dea565334a1b39a36d339eb2bc9d0c2b3924e8c54f9c3adec6b31278017cfee955fe9ed9d3c29977f SHA512 1a2476060f43559ec89663377361d1fcaace7fe3aa3b472629dca78557e6d5868d8f5cfce3411c46804b501d6a56dcb074f6becf3d8e756b7f7fd943087cd3ae |
| 25 |
DIST sysdig-0.26.3.tar.gz 902206 BLAKE2B ec25d0441c69b8c4c4fc431d073d2f93e476ece7add98412e54ce4286bcd7e32d4b1ff89f75dd728dc66c7d77da157bed2182bad85557c0dcec09648f86abb3d SHA512 f700d1ddae687a3474a8bf6816d2fef6c69e963a269a90a8362287dee698ac9799da18f01f383368c906d294ceb046160a8b0792292a72a3b08fc614b5b69d32 |
| 26 |
DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88 |
| 27 |
|
| 28 |
diff --git a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 8e0dfd606a1..00000000000 |
| 31 |
--- a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,52 +0,0 @@ |
| 34 |
-diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c |
| 35 |
-index 452353a6..6eb7cd16 100644 |
| 36 |
---- a/userspace/libscap/scap_fds.c |
| 37 |
-+++ b/userspace/libscap/scap_fds.c |
| 38 |
-@@ -49,6 +49,7 @@ limitations under the License. |
| 39 |
- #include <errno.h> |
| 40 |
- #include <netinet/tcp.h> |
| 41 |
- #if defined(__linux__) |
| 42 |
-+#include <sys/sysmacros.h> |
| 43 |
- #include <linux/netlink.h> |
| 44 |
- #include <linux/rtnetlink.h> |
| 45 |
- //#include <linux/sock_diag.h> |
| 46 |
-diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt |
| 47 |
-index bc851319..ec454de7 100644 |
| 48 |
---- a/userspace/libsinsp/CMakeLists.txt |
| 49 |
-+++ b/userspace/libsinsp/CMakeLists.txt |
| 50 |
-@@ -145,7 +145,9 @@ add_library(sinsp STATIC ${SINSP_SOURCES}) |
| 51 |
- |
| 52 |
- target_link_libraries(sinsp |
| 53 |
- scap |
| 54 |
-- "${JSONCPP_LIB}") |
| 55 |
-+ "${CURL_LIBRARIES}" |
| 56 |
-+ "${JSONCPP_LIB}" |
| 57 |
-+ "${TBB_LIB}") |
| 58 |
- |
| 59 |
- if(USE_BUNDLED_LUAJIT) |
| 60 |
- add_dependencies(sinsp luajit) |
| 61 |
-@@ -157,13 +159,12 @@ if(NOT WIN32) |
| 62 |
- endif() |
| 63 |
- if(USE_BUNDLED_CURL) |
| 64 |
- add_dependencies(sinsp curl) |
| 65 |
-- target_link_libraries(sinsp |
| 66 |
-- "${CURL_LIBRARIES}") |
| 67 |
- endif() |
| 68 |
- if(USE_BUNDLED_TBB) |
| 69 |
- add_dependencies(sinsp tbb) |
| 70 |
-- target_link_libraries(sinsp |
| 71 |
-- "${TBB_LIB}") |
| 72 |
-+ endif() |
| 73 |
-+ if(USE_BUNDLED_GRPC) |
| 74 |
-+ add_dependencies(sinsp grpc) |
| 75 |
- endif() |
| 76 |
- |
| 77 |
- if(NOT APPLE) |
| 78 |
-@@ -177,7 +178,6 @@ if(NOT WIN32) |
| 79 |
- COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto |
| 80 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) |
| 81 |
- |
| 82 |
-- add_dependencies(sinsp grpc) |
| 83 |
- target_link_libraries(sinsp |
| 84 |
- "${GRPCPP_LIB}" |
| 85 |
- "${GRPC_LIB}" |
| 86 |
|
| 87 |
diff --git a/dev-util/sysdig/sysdig-0.26.1.ebuild b/dev-util/sysdig/sysdig-0.26.1.ebuild |
| 88 |
deleted file mode 100644 |
| 89 |
index a6c3bad4d48..00000000000 |
| 90 |
--- a/dev-util/sysdig/sysdig-0.26.1.ebuild |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,97 +0,0 @@ |
| 93 |
-# Copyright 1999-2019 Gentoo Authors |
| 94 |
-# Distributed under the terms of the GNU General Public License v2 |
| 95 |
- |
| 96 |
-EAPI=7 |
| 97 |
- |
| 98 |
-MODULES_OPTIONAL_USE=modules |
| 99 |
-inherit linux-mod bash-completion-r1 cmake-utils |
| 100 |
- |
| 101 |
-DESCRIPTION="A system exploration and troubleshooting tool" |
| 102 |
-HOMEPAGE="https://www.sysdig.org/" |
| 103 |
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 104 |
- |
| 105 |
-LICENSE="Apache-2.0 |
| 106 |
- modules? ( || ( MIT GPL-2 ) )" |
| 107 |
-SLOT="0" |
| 108 |
-KEYWORDS="~amd64 ~x86" |
| 109 |
-IUSE="libressl +modules" |
| 110 |
- |
| 111 |
-RDEPEND=" |
| 112 |
- app-misc/jq:0= |
| 113 |
- dev-cpp/tbb:0= |
| 114 |
- dev-lang/luajit:2= |
| 115 |
- >=dev-libs/jsoncpp-0.6_pre:0= |
| 116 |
- dev-libs/libb64:0= |
| 117 |
- dev-libs/protobuf:0= |
| 118 |
- net-dns/c-ares:0= |
| 119 |
- net-libs/grpc:0= |
| 120 |
- sys-libs/ncurses:0= |
| 121 |
- sys-libs/zlib:0= |
| 122 |
- libressl? ( dev-libs/libressl:0= ) |
| 123 |
- !libressl? ( dev-libs/openssl:0= ) |
| 124 |
- net-misc/curl:0=" |
| 125 |
-DEPEND="${RDEPEND} |
| 126 |
- app-arch/xz-utils |
| 127 |
- virtual/os-headers" |
| 128 |
- |
| 129 |
-# needed for the kernel module |
| 130 |
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS" |
| 131 |
- |
| 132 |
-pkg_pretend() { |
| 133 |
- linux-mod_pkg_setup |
| 134 |
-} |
| 135 |
- |
| 136 |
-pkg_setup() { |
| 137 |
- linux-mod_pkg_setup |
| 138 |
-} |
| 139 |
- |
| 140 |
-src_prepare() { |
| 141 |
- sed -i -e 's:-ggdb::' CMakeLists.txt || die |
| 142 |
- |
| 143 |
- eapply "${FILESDIR}"/sysdig-0.26.0-build-fixes.patch |
| 144 |
- cmake-utils_src_prepare |
| 145 |
-} |
| 146 |
- |
| 147 |
-src_configure() { |
| 148 |
- local mycmakeargs=( |
| 149 |
- # we will use linux-mod for that |
| 150 |
- -DBUILD_DRIVER=OFF |
| 151 |
- # libscap examples are not installed or really useful |
| 152 |
- -DBUILD_LIBSCAP_EXAMPLES=OFF |
| 153 |
- |
| 154 |
- # unbundle the deps |
| 155 |
- -DUSE_BUNDLED_DEPS=OFF |
| 156 |
- ) |
| 157 |
- |
| 158 |
- cmake-utils_src_configure |
| 159 |
- |
| 160 |
- # setup linux-mod ugliness |
| 161 |
- MODULE_NAMES="sysdig-probe(extra:${S}/driver:)" |
| 162 |
- BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"' |
| 163 |
- BUILD_TARGETS="all" |
| 164 |
- |
| 165 |
- if use modules; then |
| 166 |
- cmake-utils_src_make configure_driver |
| 167 |
- |
| 168 |
- cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die |
| 169 |
- fi |
| 170 |
-} |
| 171 |
- |
| 172 |
-src_compile() { |
| 173 |
- cmake-utils_src_compile |
| 174 |
- |
| 175 |
- linux-mod_src_compile |
| 176 |
-} |
| 177 |
- |
| 178 |
-src_install() { |
| 179 |
- cmake-utils_src_install |
| 180 |
- |
| 181 |
- linux-mod_src_install |
| 182 |
- |
| 183 |
- # remove sources |
| 184 |
- rm -r "${ED}"/usr/src || die |
| 185 |
- |
| 186 |
- # move bashcomp to the proper location |
| 187 |
- dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die |
| 188 |
- rm -r "${ED}"/usr/etc || die |
| 189 |
-} |
| 190 |
|
| 191 |
diff --git a/dev-util/sysdig/sysdig-0.26.2.ebuild b/dev-util/sysdig/sysdig-0.26.2.ebuild |
| 192 |
deleted file mode 100644 |
| 193 |
index 2d4c0de2f51..00000000000 |
| 194 |
--- a/dev-util/sysdig/sysdig-0.26.2.ebuild |
| 195 |
+++ /dev/null |
| 196 |
@@ -1,88 +0,0 @@ |
| 197 |
-# Copyright 1999-2019 Gentoo Authors |
| 198 |
-# Distributed under the terms of the GNU General Public License v2 |
| 199 |
- |
| 200 |
-EAPI=7 |
| 201 |
- |
| 202 |
-MODULES_OPTIONAL_USE=modules |
| 203 |
-inherit linux-mod bash-completion-r1 cmake-utils |
| 204 |
- |
| 205 |
-DESCRIPTION="A system exploration and troubleshooting tool" |
| 206 |
-HOMEPAGE="https://www.sysdig.org/" |
| 207 |
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 208 |
- |
| 209 |
-LICENSE="Apache-2.0 |
| 210 |
- modules? ( || ( MIT GPL-2 ) )" |
| 211 |
-SLOT="0" |
| 212 |
-KEYWORDS="~amd64 ~x86" |
| 213 |
-IUSE="libressl +modules" |
| 214 |
- |
| 215 |
-RDEPEND=" |
| 216 |
- app-misc/jq:0= |
| 217 |
- dev-cpp/tbb:0= |
| 218 |
- dev-lang/luajit:2= |
| 219 |
- >=dev-libs/jsoncpp-0.6_pre:0= |
| 220 |
- dev-libs/libb64:0= |
| 221 |
- dev-libs/protobuf:0= |
| 222 |
- net-dns/c-ares:0= |
| 223 |
- net-libs/grpc:0= |
| 224 |
- sys-libs/ncurses:0= |
| 225 |
- sys-libs/zlib:0= |
| 226 |
- libressl? ( dev-libs/libressl:0= ) |
| 227 |
- !libressl? ( dev-libs/openssl:0= ) |
| 228 |
- net-misc/curl:0=" |
| 229 |
-DEPEND="${RDEPEND} |
| 230 |
- app-arch/xz-utils |
| 231 |
- virtual/os-headers" |
| 232 |
- |
| 233 |
-# needed for the kernel module |
| 234 |
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS" |
| 235 |
- |
| 236 |
-pkg_pretend() { |
| 237 |
- linux-mod_pkg_setup |
| 238 |
-} |
| 239 |
- |
| 240 |
-pkg_setup() { |
| 241 |
- linux-mod_pkg_setup |
| 242 |
-} |
| 243 |
- |
| 244 |
-src_prepare() { |
| 245 |
- sed -i -e 's:-ggdb::' CMakeLists.txt || die |
| 246 |
- |
| 247 |
- cmake-utils_src_prepare |
| 248 |
-} |
| 249 |
- |
| 250 |
-src_configure() { |
| 251 |
- local mycmakeargs=( |
| 252 |
- # we will use linux-mod for that |
| 253 |
- -DBUILD_DRIVER=OFF |
| 254 |
- # libscap examples are not installed or really useful |
| 255 |
- -DBUILD_LIBSCAP_EXAMPLES=OFF |
| 256 |
- |
| 257 |
- # unbundle the deps |
| 258 |
- -DUSE_BUNDLED_DEPS=OFF |
| 259 |
- ) |
| 260 |
- |
| 261 |
- cmake-utils_src_configure |
| 262 |
- |
| 263 |
- # setup linux-mod ugliness |
| 264 |
- MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)" |
| 265 |
- BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"' |
| 266 |
- BUILD_TARGETS="all" |
| 267 |
-} |
| 268 |
- |
| 269 |
-src_compile() { |
| 270 |
- cmake-utils_src_compile |
| 271 |
- linux-mod_src_compile |
| 272 |
-} |
| 273 |
- |
| 274 |
-src_install() { |
| 275 |
- cmake-utils_src_install |
| 276 |
- linux-mod_src_install |
| 277 |
- |
| 278 |
- # remove sources |
| 279 |
- rm -r "${ED}"/usr/src || die |
| 280 |
- |
| 281 |
- # move bashcomp to the proper location |
| 282 |
- dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die |
| 283 |
- rm -r "${ED}"/usr/etc || die |
| 284 |
-} |
Archives