dev April 2020

dev@openadk.org

2 participants
20 discussions

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/flask/Makefile | 38 ++++++++++++++++++++++++++++++++++++ package/flask/patches/patch-setup_py | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 package/flask/Makefile create mode 100644 package/flask/patches/patch-setup_py diff --git a/package/flask/Makefile b/package/flask/Makefile new file mode 100644 index 000000000..2042ac4df --- /dev/null +++ b/package/flask/Makefile @@ -0,0 +1,38 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= Flask +PKG_VERSION:= 1.1.1 +PKG_RELEASE:= 1 +PKG_HASH:= 13f9f196f330c7c2c5d7a5cf91af894110ca0215ac051b5844701f2bfd934d52 +PKG_DESCR:= flask python web framework +PKG_SECTION:= net/http +PKG_URL:= https://pypi.org/project/Flask/ +PKG_SITES:= https://files.pythonhosted.org/packages/2e/80/3726a729de758513fd3dbc64e9309… +PKG_DEPENDS:= python3 python3-mod-zlib +PKG_BUILDDEP:= python3 + +DISTFILES:= Flask-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FLASK,flask,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +include $(ADK_TOPDIR)/mk/python3.mk + +do-build: + cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build + $(INSTALL_DIR) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages + cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR):$(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr" + +do-install: + $(INSTALL_DIR) $(IDIR_FLASK)/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* $(IDIR_FLASK)/usr/lib/python$(PYTHON_VERSION)/site-packages/ + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/flask/patches/patch-setup_py b/package/flask/patches/patch-setup_py new file mode 100644 index 000000000..4ac6c27fb --- /dev/null +++ b/package/flask/patches/patch-setup_py @@ -0,0 +1,37 @@ +--- Flask-1.1.1.orig/setup.py 2019-07-08 19:59:15.000000000 +0200 ++++ Flask-1.1.1/setup.py 2020-04-11 10:54:23.217330259 +0200 +@@ -1,8 +1,32 @@ + import io + import re + +-from setuptools import find_packages +-from setuptools import setup ++try: ++ from setuptools import find_packages ++except ImportError: ++ import os ++ from distutils.util import convert_path ++ ++ def find_packages(base_path): ++ base_path = convert_path(base_path) ++ found = [] ++ for root, dirs, files in os.walk(base_path, followlinks=True): ++ dirs[:] = [d for d in dirs if d[0] != '.' and d not in ('ez_setup', '__pycache__')] ++ relpath = os.path.relpath(root, base_path) ++ parent = relpath.replace(os.sep, '.').lstrip('.') ++ if relpath != '.' and parent not in found: ++ # foo.bar package but no foo package, skip ++ continue ++ for dir in dirs: ++ if os.path.isfile(os.path.join(root, dir, '__init__.py')): ++ package = '.'.join((parent, dir)) if parent else dir ++ found.append(package) ++ return found ++ ++try: ++ from setuptools import setup ++except ImportError: ++ from distutils.core import setup + + with io.open("README.rst", "rt", encoding="utf8") as f: + readme = f.read() -- 2.11.0

4 years

[PATCH 2/3] python3: fix install of optional modules

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/python3/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python3/Makefile b/package/python3/Makefile index 299e99096..04a7402b9 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -59,9 +59,9 @@ define PKG_mod_template INSTALL_MODS_$${ADK_PACKAGE_${1}}+= ${2}-install ${2}-install: - ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.6/lib-dynload + ${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/python3.8/lib-dynload for m in ${2}; do \ - ${INSTALL_DATA} $(WRKINST)/usr/lib/python3.6/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.6/lib-dynload ;\ + ${INSTALL_DATA} $(WRKINST)/usr/lib/python3.8/lib-dynload/$$$${m}*.so $$(IDIR_$(1))/usr/lib/python3.8/lib-dynload ;\ done endef @@ -94,6 +94,7 @@ CONFIGURE_ARGS:= --with-threads \ --with-system-expat \ --disable-ipv6 \ --without-cxx-main + CONFIGURE_ENV+= ac_cv_have_long_long_format=yes \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=no -- 2.11.0

4 years

[PATCH 1/1] python3: fixed submodule build at least for x86

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/python3/patches/patch-setup_py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/python3/patches/patch-setup_py diff --git a/package/python3/patches/patch-setup_py b/package/python3/patches/patch-setup_py new file mode 100644 index 000000000..90acd7eea --- /dev/null +++ b/package/python3/patches/patch-setup_py @@ -0,0 +1,11 @@ +--- Python-3.8.2.orig/setup.py 2020-02-24 22:36:25.000000000 +0100 ++++ Python-3.8.2/setup.py 2020-04-15 22:28:11.208150620 +0200 +@@ -654,7 +654,7 @@ class PyBuildExt(build_ext): + # only change this for cross builds for 3.3, issues on Mageia + if CROSS_COMPILING: + self.add_cross_compiling_paths() +- self.add_multiarch_paths() ++# self.add_multiarch_paths() + self.add_ldflags_cppflags() + + def init_inc_lib_dirs(self): -- 2.11.0

4 years

[PATCH 6/6] python3: fix package build path names

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/python3/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/python3/Makefile b/package/python3/Makefile index 3ba447b77..299e99096 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -103,15 +103,15 @@ HOST_CONFIGURE_ARGS+= --without-cxx-main \ python3-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/bin ${IDIR_PYTHON3}/usr/lib - ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.6 - ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.6m + ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/lib/python3.8 + ${INSTALL_DIR} ${IDIR_PYTHON3}/usr/include/python3.8 ${INSTALL_BIN} ${WRKINST}/usr/bin/python3 ${IDIR_PYTHON3}/usr/bin ${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON3}/usr/lib - ${CP} ${WRKINST}/usr/lib/python3.6/* ${IDIR_PYTHON3}/usr/lib/python3.6 - ${CP} ${WRKINST}/usr/include/python3.6m/pyconfig.h \ - ${IDIR_PYTHON3}/usr/include/python3.6m + ${CP} ${WRKINST}/usr/lib/python3.8/* ${IDIR_PYTHON3}/usr/lib/python3.8 + ${CP} ${WRKINST}/usr/include/python3.8/pyconfig.h \ + ${IDIR_PYTHON3}/usr/include/python3.8 @-for i in zlib _bz2 _curses _ssl _gdbm _sqlite pyexpat readline; do \ - rm ${IDIR_PYTHON3}/usr/lib/python3.6/lib-dynload/$${i}*so; \ + rm ${IDIR_PYTHON3}/usr/lib/python3.8/lib-dynload/$${i}*so; \ done include ${ADK_TOPDIR}/mk/host-bottom.mk -- 2.11.0

4 years

[PATCH 5/5] python3: updated to 3.8 and added ssl support for host

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/python3/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python3/Makefile b/package/python3/Makefile index ef37bcf72..3ba447b77 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= python3 -PKG_VERSION:= 3.6.4 +PKG_VERSION:= 3.8.2 PKG_RELEASE:= 1 -PKG_HASH:= 159b932bf56aeaa76fd66e7420522d8c8853d486b8567c459b84fe2ed13bcaba +PKG_HASH:= 2646e7dc233362f59714c6193017bb2d6f7b38d6ab4a0cb5fbac5c36c4d845df PKG_DESCR:= python3 scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libffi PKG_BUILDDEP:= python3-host libffi -HOST_BUILDDEP:= libffi-host +HOST_BUILDDEP:= libffi-host libressl-host PKG_NEEDS:= threads PKG_URL:= http://www.python.org/ PKG_SITES:= http://legacy.python.org/ftp/python/${PKG_VERSION}/ -- 2.11.0

4 years

[PATCH 4/4] new package paho

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/paho/Makefile | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/paho/Makefile diff --git a/package/paho/Makefile b/package/paho/Makefile new file mode 100644 index 000000000..b28d6dd1e --- /dev/null +++ b/package/paho/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= paho +PKG_VERSION:= v1.3.1 +PKG_RELEASE:= 1 +#PKG_HASH:= 7b4eed66ae3df3613629139c0df28b16abfa4e0927bd17360027d936784aa55e +PKG_GIT:= tag +PKG_DESCR:= Eclipse Paho MQTT client library +PKG_SECTION:= libs/misc +PKG_URL:= https://www.eclipse.org/paho/clients/c/a +PKG_SITES:= https://github.com/eclipse/paho.mqtt.c.git +PKG_OPTS:= dev + +#DISTFILES:= v$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PAHO,paho,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + + +CONFIG_STYLE:= cmake + +paho-install: + $(INSTALL_DIR) $(IDIR_PAHO)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/MQTTVersion \ + $(IDIR_PAHO)/usr/bin + $(INSTALL_DIR) $(IDIR_PAHO)/usr/lib + $(CP) $(WRKINST)/usr/lib/libpaho*.so* \ + $(IDIR_PAHO)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- 2.11.0

4 years

[PATCH 3/3] new package squirrel

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/squirrel/Makefile | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/squirrel/Makefile diff --git a/package/squirrel/Makefile b/package/squirrel/Makefile new file mode 100644 index 000000000..0739f8f8e --- /dev/null +++ b/package/squirrel/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +# always use tab spaces as separator, no spaces +PKG_NAME:= squirrel +PKG_VERSION:= 3.1 +PKG_RELEASE:= 1 +PKG_HASH:= 4845a7fb82e4740bde01b0854112e3bb92a0816ad959c5758236e73f4409d0cb +PKG_DESCR:= the squirrel language +PKG_SECTION:= dev/lang +PKG_BUILDDEP:= cmake-host +PKG_NEEDS:= c++ +PKG_URL:= squirrel-lang.org +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=squirrel/) +DISTFILES:= $(PKG_NAME)_3_1_stable.tar.gz +WRKDIST= $(WRKDIR)/$(PKG_NAME)3 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,SQUIRREL,squirrel,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= cmake + +squirrel-install: + $(INSTALL_DIR) $(IDIR_SQUIRREL)/usr/bin + $(INSTALL_DIR) $(IDIR_SQUIRREL)/usr/lib + $(INSTALL_BIN) $(WRKINST)/usr/bin/sq \ + $(IDIR_SQUIRREL)/usr/bin + $(CP) $(WRKINST)/usr/lib/libsq*.so* \ + $(IDIR_SQUIRREL)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- 2.11.0

4 years

[PATCH 1/2] fixed emphasis that broke doc build

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- docs/customize-rootfs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/customize-rootfs.txt b/docs/customize-rootfs.txt index 54846dba5..3d4f0bf7b 100644 --- a/docs/customize-rootfs.txt +++ b/docs/customize-rootfs.txt @@ -25,5 +25,5 @@ loss of customized configuration data. Another option is to configure a post-build action. This is available in +Global settings+. It must point to a script relative to the root of your openadk working copy. It will be invoked as part of the -+*-imageinstall+ step with $ADK_TOPDIR as first argument. You can use ++-imageinstall+ step with $ADK_TOPDIR as first argument. You can use it e.g. to modify the +root_*+ filesystem before bundling it. -- 2.11.0

4 years

[PATCH 1/5] updated parted to 3.3 removed integrated patch

by Joerg Seitter

From: Joerg Seitter <oss(a)seitter.net> Signed-off-by: Joerg Seitter <oss(a)seitter.net> --- package/parted/Makefile | 6 ++-- .../parted/patches/patch-libparted_arch_linux_c | 41 ---------------------- 2 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 package/parted/patches/patch-libparted_arch_linux_c diff --git a/package/parted/Makefile b/package/parted/Makefile index 41e59b96c..86528d6ae 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= parted -PKG_VERSION:= 3.2 -PKG_RELEASE:= 3 -PKG_HASH:= 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 +PKG_VERSION:= 3.3 +PKG_RELEASE:= 4 +PKG_HASH:= 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 PKG_DESCR:= partition table editor PKG_SECTION:= sys/fs PKG_DEPENDS:= libblkid libuuid libncurses diff --git a/package/parted/patches/patch-libparted_arch_linux_c b/package/parted/patches/patch-libparted_arch_linux_c deleted file mode 100644 index 7a8efcf04..000000000 --- a/package/parted/patches/patch-libparted_arch_linux_c +++ /dev/null @@ -1,41 +0,0 @@ ---- parted-3.2.orig/libparted/arch/linux.c 2014-06-15 14:15:54.000000000 -0500 -+++ parted-3.2/libparted/arch/linux.c 2015-01-03 14:10:43.244848741 -0600 -@@ -2304,6 +2304,7 @@ zasprintf (const char *format, ...) - return r < 0 ? NULL : resultp; - } - -+#ifdef ENABLE_DEVICE_MAPPER - static char * - dm_canonical_path (PedDevice const *dev) - { -@@ -2326,12 +2327,17 @@ dm_canonical_path (PedDevice const *dev) - err: - return NULL; - } -+#endif - - static char* - _device_get_part_path (PedDevice const *dev, int num) - { -+#ifdef ENABLE_DEVICE_MAPPER - char *devpath = (dev->type == PED_DEVICE_DM - ? dm_canonical_path (dev) : dev->path); -+#else -+ char *devpath = dev->path; -+#endif - size_t path_len = strlen (devpath); - char *result; - /* Check for devfs-style /disc => /partN transformation -@@ -2946,10 +2952,12 @@ _disk_sync_part_table (PedDisk* disk) - - - if (disk->dev->type == PED_DEVICE_DM) { -+#ifdef ENABLE_DEVICE_MAPPER - add_partition = _dm_add_partition; - remove_partition = _dm_remove_partition; - resize_partition = _dm_resize_partition; - get_partition_start_and_length = _dm_get_partition_start_and_length; -+#endif - } else { - add_partition = _blkpg_add_partition; - remove_partition = _blkpg_remove_partition; -- 2.11.0

4 years, 1 month

test, please ignore

by Waldemar Brodkorb

4 years, 1 month

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

dev April 2020