Skip to contentSkip to conversation

packagegroup-core-sdk: remove intltool

PATCH New Ross Burton 1 participant 5 messages Nov 20, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 packagegroup-core-sdk: remove intltool

Intltool is deprecated these days, as gettext can handle almost everything intltool could. Remove it from the SDK packagegroups, if it is needed then the user can add it explicitly.

---
 meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +0 -1
index 8854ec4801f..03fa5296c15 100644
@@ -16,7 +16,6 @@ RDEPENDS_packagegroup-core-sdk = "\
     coreutils \
     ccache \
     diffutils \
-    intltool \
     perl-module-re \
     perl-module-text-wrap \
     findutils \
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/5 packagegroup-core-self-hosted: remove intltool

Very little software needs intltool to build, and we don't need it on the host to build Poky.

---
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +0 -1
index ee9d0636f2f..1fcc142cacf 100644
@@ -75,7 +75,6 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
     g++-symlinks \
     gcc \
     gcc-symlinks \
-    intltool \
     ldd \
     less \
     libstdc++ \
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/5 parted: fix whitespace

In reply to Ross Burton
---
 meta/recipes-extended/parted/parted_3.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/parted/parted_3.2.bb +1 -1
index 21a815345a9..fb5fa33a8ad 100644
@@ -14,7 +14,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
            file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \
            file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \
-	   file://0001-linux-Include-sys-sysmacros.h-for-major-macro.patch \
+           file://0001-linux-Include-sys-sysmacros.h-for-major-macro.patch \
            file://run-ptest \
            file://Makefile \
            file://0001-libparted-Use-read-only-when-probing-devices-on-linu.patch \
Signature · 1 line
2.20.1
#3 lore raw

PATCH 4/5 grub: inherit pkgconfig

In reply to Ross Burton

Grub uses pkg-config but is only in the sysroot via dependencies. Be explicit and inherit pkgconfig directly.

---
 meta/recipes-bsp/grub/grub2.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/grub/grub2.inc +1 -1
index c81def2a170..7138e4df872 100644
@@ -33,7 +33,7 @@ GRUBPLATFORM_arm = "efi"
 GRUBPLATFORM_aarch64 = "efi"
 GRUBPLATFORM ??= "pc"
 
-inherit autotools gettext texinfo
+inherit autotools gettext texinfo pkgconfig
 
 EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} \
                 --disable-grub-mkfont \
Signature · 1 line
2.20.1
#4 lore raw

PATCH 5/5 grub: don't autoreconf twice

In reply to Ross Burton

do_configure() essentially calls autogen.sh to generate some sources and then autoreconf, but autogen.sh also calls autoreconf.

Pass a magic variable so that autogen.sh doesn't autoreconf for us.

---
 meta/recipes-bsp/grub/grub2.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-bsp/grub/grub2.inc +3 -2
index 7138e4df872..b3291cb4b80 100644
@@ -60,8 +60,9 @@ BUILD_LDFLAGS = ""
 export PYTHON = "python3"
 
 do_configure_prepend() {
-	( cd ${S}
-	${S}/autogen.sh )
+	cd ${S}
+	FROM_BOOTSTRAP=1 ${S}/autogen.sh
+	cd ${B}
 }
 
 RDEPENDS_${PN}_class-native = ""
Signature · 1 line
2.20.1