From 64c032231bf9b7af9c8a1ef0c84334194f202218 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 22 Jan 2020 20:04:00 -0800 Subject: [PATCH 1/3] libmbim: do not use autoreconf Autoreconf picks up host git, which breaks compilation. Signed-off-by: Rosen Penev --- libs/libmbim/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/libmbim/Makefile b/libs/libmbim/Makefile index 787851a18..ac0e9b971 100644 --- a/libs/libmbim/Makefile +++ b/libs/libmbim/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmbim PKG_VERSION:=1.22.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libmbim @@ -20,8 +20,6 @@ PKG_MAINTAINER:=Nicholas Smith PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_FIXUP:=autoreconf - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk From 4e0e42ebe656e9fa88454444e1d7c2e28b3a0ac9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 22 Jan 2020 20:04:35 -0800 Subject: [PATCH 2/3] libqmi: do not use autoreconf Autoreconf picks up host git, which breaks compilation. Signed-off-by: Rosen Penev --- libs/libqmi/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index ab6735c78..7d2413c14 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi PKG_VERSION:=1.24.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libqmi @@ -20,8 +20,6 @@ PKG_MAINTAINER:=Nicholas Smith PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_FIXUP:=autoreconf - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk From cfd1e8c12d6876a9f81ea98d66c89b1654293fc2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 22 Jan 2020 20:08:48 -0800 Subject: [PATCH 3/3] modemmanager: fixed license information Removed unrecognized configure option. Small cleanups. Signed-off-by: Rosen Penev --- net/modemmanager/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index a4132a52b..0e39f21ba 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_VERSION:=1.12.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager @@ -17,16 +17,14 @@ PKG_HASH:=852d61755e0c1a8d0c609b17192d742b324fdd2e513f3ed64b228befb859a95b PKG_BUILD_DIR:=$(BUILD_DIR)/ModemManager-$(PKG_VERSION) PKG_MAINTAINER:=Nicholas Smith -LICENSE:=GPL-2.0-or-later -LICENSE_FILES:=COPYING +PKG_LICENSE:=GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 - PKG_BUILD_DEPENDS:=glib2/host libxslt/host -PKG_FIXUP:=autoreconf - include $(INCLUDE_DIR)/package.mk define Package/modemmanager/config @@ -56,10 +54,9 @@ endef CONFIGURE_ARGS += \ --without-polkit \ --without-udev \ - --without-suspend-resume \ - --with-systemdsystemunitdir=no \ + --without-systemdsystemunitdir \ --disable-rpath \ - --disable-gtk-doc + --disable-gtk-doc ifdef CONFIG_MODEMMANAGER_WITH_MBIM CONFIGURE_ARGS += --with-mbim