From f1c0e9fca917fbad537d91a9bc4340f35a0f5958 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 18 Sep 2020 21:52:46 -0700 Subject: [PATCH 1/2] perl-parse-yapp: fix compilation under the CI Wrong path to perlmod.mk. Use what everything else uses. Signed-off-by: Rosen Penev --- lang/perl-parse-yapp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/perl-parse-yapp/Makefile b/lang/perl-parse-yapp/Makefile index c9cf1ce43..b95e0a6f0 100644 --- a/lang/perl-parse-yapp/Makefile +++ b/lang/perl-parse-yapp/Makefile @@ -24,7 +24,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Parse-Yapp-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -include $(TOPDIR)/feeds/packages/lang/perl/perlmod.mk +include ../perl/perlmod.mk define Package/perl-parse-yapp SUBMENU:=Perl From 836b4e1c734f9705bfd8db0da0c04214c2647932 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 18 Sep 2020 23:56:12 -0700 Subject: [PATCH 2/2] github-ci: add --force-removal-of-dependent-packages Without this option, a package gets installed with its dependencies but those do not get removed, causing issues later on with other packages. Signed-off-by: Rosen Penev --- .github/workflows/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/entrypoint.sh b/.github/workflows/entrypoint.sh index 63ef09c27..c85674d94 100755 --- a/.github/workflows/entrypoint.sh +++ b/.github/workflows/entrypoint.sh @@ -28,5 +28,5 @@ for PKG in /ci/*.ipk; do echo "No test.sh script available" fi - opkg remove "$PKG_NAME" + opkg remove "$PKG_NAME" --force-removal-of-dependent-packages --force-remove done