From 6116bf019cdc83a95d58988276a76e3abc23a79f Mon Sep 17 00:00:00 2001 From: Yan Wu Date: Mon, 11 Apr 2022 14:09:51 +0800 Subject: [PATCH 1/3] buildroot patch fixup --- .../0002-Add-wastedcores-profiler-and-sanity-checker.patch | 2 +- buildroot_patches/0003-Add-mctest-package.patch | 2 +- ...-Enable-configuring-wastcores-profiler-in-menuconfig.patch | 4 ++-- ...0005-Enable-wastedcore-building-with-extra-profiling.patch | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch b/buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch index d53401e..1715ec5 100644 --- a/buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch +++ b/buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch @@ -22,7 +22,7 @@ index e5e7594..e3d60b7 100644 + source "package/wastedcores/Config.in" endmenu - menu "Flight Software" + endmenu diff --git a/package/wastedcores/Config.in b/package/wastedcores/Config.in new file mode 100644 index 0000000..92416bb diff --git a/buildroot_patches/0003-Add-mctest-package.patch b/buildroot_patches/0003-Add-mctest-package.patch index 6ed28d9..4c5ef06 100644 --- a/buildroot_patches/0003-Add-mctest-package.patch +++ b/buildroot_patches/0003-Add-mctest-package.patch @@ -22,7 +22,7 @@ index e3d60b7..9922e80 100644 + source "package/mctest/Config.in" endmenu - menu "Flight Software" + endmenu diff --git a/package/mctest/Config.in b/package/mctest/Config.in new file mode 100644 index 0000000..27e09a1 diff --git a/buildroot_patches/0004-Enable-configuring-wastcores-profiler-in-menuconfig.patch b/buildroot_patches/0004-Enable-configuring-wastcores-profiler-in-menuconfig.patch index cb05d4b..7509418 100644 --- a/buildroot_patches/0004-Enable-configuring-wastcores-profiler-in-menuconfig.patch +++ b/buildroot_patches/0004-Enable-configuring-wastcores-profiler-in-menuconfig.patch @@ -40,8 +40,8 @@ index 039d8ae..3dd9b87 100644 +WASTEDCORES_MODULE_MAKE_OPTS = "CFLAGS_sched_profiler.o=-DNUM_CPU=$(BR2_PACKAGE_WASTEDCORES_NUM_CPU) -DMAX_SAMPLE_ENTRIES=$(BR2_PACKAGE_WASTEDCORES_MAX_SAMPLE)" + - WASTEDCORES_MODULE_SUBDIRS = tools/sanity_checker_4.1/stap_monitor \ - tools/visualizations_4.1/sched_profiler + WASTEDCORES_MODULE_SUBDIRS = tools/sanity_checker_4.4/stap_monitor \ + tools/visualizations_4.4/sched_profiler WASTEDCORES_DEPENDENCIES = linux -- 2.7.4 diff --git a/buildroot_patches/0005-Enable-wastedcore-building-with-extra-profiling.patch b/buildroot_patches/0005-Enable-wastedcore-building-with-extra-profiling.patch index 034ace6..34ae939 100644 --- a/buildroot_patches/0005-Enable-wastedcore-building-with-extra-profiling.patch +++ b/buildroot_patches/0005-Enable-wastedcore-building-with-extra-profiling.patch @@ -37,8 +37,8 @@ index 3dd9b87..660e3f7 100644 WASTEDCORES_MODULE_MAKE_OPTS = "CFLAGS_sched_profiler.o=-DNUM_CPU=$(BR2_PACKAGE_WASTEDCORES_NUM_CPU) -DMAX_SAMPLE_ENTRIES=$(BR2_PACKAGE_WASTEDCORES_MAX_SAMPLE)" +endif - WASTEDCORES_MODULE_SUBDIRS = tools/sanity_checker_4.1/stap_monitor \ - tools/visualizations_4.1/sched_profiler + WASTEDCORES_MODULE_SUBDIRS = tools/sanity_checker_4.4/stap_monitor \ + tools/visualizations_4.4/sched_profiler -- 2.7.4 From ba681d12d184a2dd9e0d6982c47e230a54ce1a28 Mon Sep 17 00:00:00 2001 From: Yan Wu Date: Thu, 14 Apr 2022 11:22:10 +0800 Subject: [PATCH 2/3] Modify the download method of `mctest` package Due the permission denied of git fetch, let's go for http downloading --- buildroot_patches/0003-Add-mctest-package.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot_patches/0003-Add-mctest-package.patch b/buildroot_patches/0003-Add-mctest-package.patch index 4c5ef06..32f9bc1 100644 --- a/buildroot_patches/0003-Add-mctest-package.patch +++ b/buildroot_patches/0003-Add-mctest-package.patch @@ -46,8 +46,8 @@ index 0000000..c64bc77 +################################################################################ + +MCTEST_VERSION = master -+MCTEST_SITE = git@github.com:sonicyang/mctest.git -+MCTEST_SITE_METHOD = git ++MCTEST_SOURCE = mctest-$(MCTEST_VERSION).tar.gz ++MCTEST_SITE = http://github.com/sonicyang/mctest/tarball/$(MCTEST_VERSION) + +MCTEST_DEPENDENCIES = linux + From 3a1925beb45df9a8d6d4bc3cb7893278f32b5dd9 Mon Sep 17 00:00:00 2001 From: Yan Wu Date: Thu, 14 Apr 2022 11:45:31 +0800 Subject: [PATCH 3/3] Modify the download method of `wastedcore` package Due the permission denied of git fetch, let's go for http downloading --- .../0002-Add-wastedcores-profiler-and-sanity-checker.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch b/buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch index 1715ec5..f6d5f29 100644 --- a/buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch +++ b/buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch @@ -46,8 +46,8 @@ index 0000000..039d8ae +################################################################################ + +WASTEDCORES_VERSION = master -+WASTEDCORES_SITE = git@github.com:sonicyang/wastedcores.git -+WASTEDCORES_SITE_METHOD = git ++WASTEDCORES_SOURCE = wasredcores-$(WASTEDCORES_VERSION).tar.gz ++WASTEDCORES_SITE = http://github.com/sonicyang/wastedcores/tarball/$(WASTEDCORES_VERSION) + +WASTEDCORES_MODULE_SUBDIRS = tools/sanity_checker_4.4/stap_monitor \ + tools/visualizations_4.4/sched_profiler