[ptxdist] [PATCH 5/9] libtag: new package
From: Ladislav Michl Signed-off-by: Ladislav Michl --- rules/libtag.in | 17 ++ rules/libtag.make | 60 +++ 2 files changed, 77 insertions(+) create mode 100644 rules/libtag.in create mode 100644 rules/libtag.make diff --git a/rules/libtag.in b/rules/libtag.in new file mode 100644 index 0..17132b49e --- /dev/null +++ b/rules/libtag.in @@ -0,0 +1,17 @@ +## SECTION=multimedia_libs + +menuconfig LIBTAG + tristate + prompt "libtag" + select HOST_CMAKE + select ZLIB if LIBTAG_ZLIB + help + A library for reading and editing the meta-data of several + popular audio formats. + +if LIBTAG + +config LIBTAG_ZLIB +bool "zlib support" + +endif diff --git a/rules/libtag.make b/rules/libtag.make new file mode 100644 index 0..8d26a56da --- /dev/null +++ b/rules/libtag.make @@ -0,0 +1,60 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Ladislav Michl +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBTAG) += libtag + +# +# Paths and names +# +LIBTAG_VERSION := 1.13.1 +LIBTAG_MD5 := 2fe6089da73ad414aa1b982b83415362 +LIBTAG := taglib-$(LIBTAG_VERSION) +LIBTAG_SUFFIX := tar.gz +LIBTAG_URL := https://taglib.org/releases/$(LIBTAG).$(LIBTAG_SUFFIX) +LIBTAG_SOURCE := $(SRCDIR)/$(LIBTAG).$(LIBTAG_SUFFIX) +LIBTAG_DIR := $(BUILDDIR)/$(LIBTAG) +LIBTAG_LICENSE := LGPL-2.1-or-later +LIBTAG_LICENSE_FILES := \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 + +# +# Prepare +# + +LIBTAG_CONF_TOOL := cmake +LIBTAG_CONF_OPT:= \ + $(CROSS_CMAKE_USR) \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_TESTING=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DWITH_ZLIB=$(call ptx/onoff, PTXCONF_LIBTAG_ZLIB) + +# +# Target-Install +# + +$(STATEDIR)/libtag.targetinstall: + @$(call targetinfo) + + @$(call install_init, libtag) + @$(call install_fixup, libtag,PRIORITY,optional) + @$(call install_fixup, libtag,SECTION,base) + @$(call install_fixup, libtag,AUTHOR,"Ladislav Michl ") + @$(call install_fixup, libtag,DESCRIPTION,missing) + + $(call install_lib, libtag, 0, 0, 0644, libtag) + + @$(call install_finish, libtag) + + @$(call touch) + +# vim: syntax=make -- 2.39.2
[ptxdist] [PATCH 4/9] gst-plugins-ugly1: unbreak cdio support
From: Ladislav Michl Signed-off-by: Ladislav Michl --- rules/gst-plugins-ugly1.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rules/gst-plugins-ugly1.in b/rules/gst-plugins-ugly1.in index 2a1dabcc1..fe8aecc8e 100644 --- a/rules/gst-plugins-ugly1.in +++ b/rules/gst-plugins-ugly1.in @@ -8,6 +8,7 @@ menuconfig GST_PLUGINS_UGLY1 select GSTREAMER1 select GST_PLUGINS_BASE1 select ORC if GST_PLUGINS_UGLY1_A52DEC + select LIBCDIO if GST_PLUGINS_UGLY1_CDIO select LIBMPEG2 if GST_PLUGINS_UGLY1_MPEG2DEC prompt "gst-plugins-ugly " help @@ -66,8 +67,6 @@ config GST_PLUGINS_UGLY1_AMRWBDEC config GST_PLUGINS_UGLY1_CDIO bool - # needs libcdio - depends on BROKEN prompt "cdio" help CD audio source plugin -- 2.39.2
[ptxdist] [PATCH 8/9] libdvdnav: new package
From: Ladislav Michl Signed-off-by: Ladislav Michl --- rules/libdvdnav.in | 10 rules/libdvdnav.make | 59 2 files changed, 69 insertions(+) create mode 100644 rules/libdvdnav.in create mode 100644 rules/libdvdnav.make diff --git a/rules/libdvdnav.in b/rules/libdvdnav.in new file mode 100644 index 0..77e73c188 --- /dev/null +++ b/rules/libdvdnav.in @@ -0,0 +1,10 @@ +## SECTION=multimedia_libs + +config LIBDVDNAV + tristate + prompt "libdvdnav" + select LIBDVDREAD + help + libdvdnav is a library that allows easy use of sophisticated + DVD navigation features such as DVD menus, multiangle playback + and even interactive DVD games. diff --git a/rules/libdvdnav.make b/rules/libdvdnav.make new file mode 100644 index 0..4efbb1691 --- /dev/null +++ b/rules/libdvdnav.make @@ -0,0 +1,59 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Ladislav Michl +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBDVDNAV) += libdvdnav + +# +# Paths and names +# +LIBDVDNAV_VERSION := 6.1.1 +LIBDVDNAV_MD5 := 46c46cb0294fbd1fcb8a0181818dad15 +LIBDVDNAV := libdvdnav-$(LIBDVDNAV_VERSION) +LIBDVDNAV_SUFFIX := tar.bz2 +LIBDVDNAV_URL := https://download.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)/$(LIBDVDNAV).$(LIBDVDNAV_SUFFIX) +LIBDVDNAV_SOURCE := $(SRCDIR)/$(LIBDVDNAV).$(LIBDVDNAV_SUFFIX) +LIBDVDNAV_DIR := $(BUILDDIR)/$(LIBDVDNAV) +LIBDVDNAV_LICENSE := GPL-2.0-or-later +LIBDVDNAV_LICENSE_FILES:= \ + file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f + +# +# Prepare +# + +# +# autoconf +# +LIBDVDNAV_CONF_TOOL:= autoconf +LIBDVDNAV_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) + +# +# Target-Install +# + +$(STATEDIR)/libdvdnav.targetinstall: + @$(call targetinfo) + + @$(call install_init, libdvdnav) + @$(call install_fixup, libdvdnav,PRIORITY,optional) + @$(call install_fixup, libdvdnav,SECTION,base) + @$(call install_fixup, libdvdnav,AUTHOR,"Ladislav Michl ") + @$(call install_fixup, libdvdnav,DESCRIPTION,missing) + + @$(call install_lib, libdvdnav, 0, 0, 0644, libdvdnav) + + @$(call install_finish, libdvdnav) + + @$(call touch) + +# vim: syntax=make -- 2.39.2
[ptxdist] [PATCH 7/9] libdvdcss: new package
From: Ladislav Michl Signed-off-by: Ladislav Michl --- rules/libdvdcss.in | 8 ++ rules/libdvdcss.make | 60 2 files changed, 68 insertions(+) create mode 100644 rules/libdvdcss.in create mode 100644 rules/libdvdcss.make diff --git a/rules/libdvdcss.in b/rules/libdvdcss.in new file mode 100644 index 0..1dc51535e --- /dev/null +++ b/rules/libdvdcss.in @@ -0,0 +1,8 @@ +## SECTION=multimedia_libs + +config LIBDVDCSS + tristate + prompt "libdvdcss" + help + A simple library designed for accessing DVDs like a block device + without having to bother about the decryption. diff --git a/rules/libdvdcss.make b/rules/libdvdcss.make new file mode 100644 index 0..930723879 --- /dev/null +++ b/rules/libdvdcss.make @@ -0,0 +1,60 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Ladislav Michl +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBDVDCSS) += libdvdcss + +# +# Paths and names +# +LIBDVDCSS_VERSION := 1.4.3 +LIBDVDCSS_MD5 := e98239a88af9b2204f9b9d987c2bc71a +LIBDVDCSS := libdvdcss-$(LIBDVDCSS_VERSION) +LIBDVDCSS_SUFFIX := tar.bz2 +LIBDVDCSS_URL := https://download.videolan.org/pub/libdvdcss/$(LIBDVDCSS_VERSION)/$(LIBDVDCSS).$(LIBDVDCSS_SUFFIX) +LIBDVDCSS_SOURCE := $(SRCDIR)/$(LIBDVDCSS).$(LIBDVDCSS_SUFFIX) +LIBDVDCSS_DIR := $(BUILDDIR)/$(LIBDVDCSS) +LIBDVDCSS_LICENSE := GPL-2.0-or-later +LIBDVDCSS_LICENSE_FILES:= \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 + +# +# Prepare +# + +# +# autoconf +# +LIBDVDCSS_CONF_TOOL:= autoconf +LIBDVDCSS_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-doc + +# +# Target-Install +# + +$(STATEDIR)/libdvdcss.targetinstall: + @$(call targetinfo) + + @$(call install_init, libdvdcss) + @$(call install_fixup, libdvdcss,PRIORITY,optional) + @$(call install_fixup, libdvdcss,SECTION,base) + @$(call install_fixup, libdvdcss,AUTHOR,"Ladislav Michl ") + @$(call install_fixup, libdvdcss,DESCRIPTION,missing) + + @$(call install_lib, libdvdcss, 0, 0, 0644, libdvdcss) + + @$(call install_finish, libdvdcss) + + @$(call touch) + +# vim: syntax=make -- 2.39.2
[ptxdist] [PATCH 6/9] gst-plugins-good1: unbreak libtag support
From: Ladislav Michl Signed-off-by: Ladislav Michl --- rules/gst-plugins-good1.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rules/gst-plugins-good1.in b/rules/gst-plugins-good1.in index 6d91fffb1..82031da0a 100644 --- a/rules/gst-plugins-good1.in +++ b/rules/gst-plugins-good1.in @@ -31,6 +31,7 @@ menuconfig GST_PLUGINS_GOOD1 select LIBSHOUT if GST_PLUGINS_GOOD1_SHOUT2 select LIBSOUP if GST_PLUGINS_GOOD1_SOUP select LIBSOUP if GST_PLUGINS_GOOD1_ADAPTIVEDEMUX2 && RUNTIME + select LIBTAG if GST_PLUGINS_GOOD1_TAGLIB select LIBXML2 if GST_PLUGINS_GOOD1_ADAPTIVEDEMUX2 select LIBGCRYPTif GST_PLUGINS_GOOD1_HLS_CRYPTO_GCRYPT select NETTLE if GST_PLUGINS_GOOD1_HLS_CRYPTO_NETTLE @@ -412,8 +413,6 @@ config GST_PLUGINS_GOOD1_SYSTEMD config GST_PLUGINS_GOOD1_TAGLIB bool - # needs libtag - depends on BROKEN prompt "taglib" help Tag-writing plugin based on taglib -- 2.39.2
[ptxdist] [PATCH v2] dtc: new package
From: Ladislav Michl Please note this package is not as symmetrical as the typical host-* and normal variants. Here the latest version is usually needed. This work is prepping for qemu 8.2.0+, as it requires libfdt as a separate library. It has stopped providing one internally. Signed-off-by: Christian Melki Signed-off-by: Ladislav Michl --- CHANGES: -v2: select HOST_FLEX, drop 'v' from url version, update md5, use proper DTC_MAKE_ENV rules/dtc.in | 37 +++ rules/dtc.make | 82 ++ 2 files changed, 119 insertions(+) create mode 100644 rules/dtc.in create mode 100644 rules/dtc.make diff --git a/rules/dtc.in b/rules/dtc.in new file mode 100644 index 0..e6d0b84d5 --- /dev/null +++ b/rules/dtc.in @@ -0,0 +1,37 @@ +## SECTION=system_libraries +menuconfig DTC + tristate + prompt "dtc " + select HOST_FLEX + help + Device Tree Compiler (dtc) toolchain. While dtc itself is + occasionally needed for device tree manipulaton on the + target, libfdt may be required. + +if DTC + +config DTC_DTC + bool + prompt "dtc" + +config DTC_DTDIFF + bool + prompt "dtdiff" + +config DTC_FDTDUMP + bool + prompt "fdtdump" + +config DTC_FDTGET + bool + prompt "fdtget" + +config DTC_FDTOVERLAY + bool + prompt "fdtoverlay" + +config DTC_FDTPUT + bool + prompt "fdtput" + +endif diff --git a/rules/dtc.make b/rules/dtc.make new file mode 100644 index 0..8aa38c5e3 --- /dev/null +++ b/rules/dtc.make @@ -0,0 +1,82 @@ +# -*-makefile-*- +# +# Copyright (C) 2022 Ladislav Michl +# Copyright (C) 2023 Christian Melki +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_DTC) += dtc + +# +# Paths and names +# +DTC_VERSION:= 1.7.0 +DTC_MD5:= f8b4469ad89f4b882091895ec60dde6b +DTC:= dtc-$(DTC_VERSION) +DTC_SUFFIX := tar.gz +DTC_URL:= https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(DTC).$(DTC_SUFFIX) +DTC_SOURCE := $(SRCDIR)/$(DTC).$(DTC_SUFFIX) +DTC_DIR:= $(BUILDDIR)/$(DTC) +DTC_LICENSE:= BSD-2-Clause OR GPL-2.0 +DTC_LICENSE_FILES := \ + file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e \ + file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927 + +# +# Prepare +# + +DTC_CONF_TOOL := NO + +DTC_MAKE_ENV := $(CROSS_ENV) + +DTC_MAKE_OPT := \ + PREFIX=/usr \ + NO_PYTHON=1 \ + NO_VALGRIND=1 \ + NO_YAML=1 + +DTC_INSTALL_OPT:= \ + $(DTC_MAKE_OPT) \ + install-bin \ + install-includes \ + install-lib + +# +# Target-Install +# + +DTC_BIN-y := +DTC_BIN-$(PTXCONF_DTC_DTC) += dtc +DTC_BIN-$(PTXCONF_DTC_DTDIFF) += dtdiff +DTC_BIN-$(PTXCONF_DTC_FDTDUMP) += fdtdump +DTC_BIN-$(PTXCONF_DTC_FDTGET) += fdtget +DTC_BIN-$(PTXCONF_DTC_FDTOVERLAY) += fdtoverlay +DTC_BIN-$(PTXCONF_DTC_FDTPUT) += fdtput + +$(STATEDIR)/dtc.targetinstall: + @$(call targetinfo) + + @$(call install_init, dtc) + @$(call install_fixup, dtc,PRIORITY,optional) + @$(call install_fixup, dtc,SECTION,base) + @$(call install_fixup, dtc,AUTHOR,"Ladislav Michl ") + @$(call install_fixup, dtc,DESCRIPTION,missing) + + @$(call install_lib, dtc, 0, 0, 0644, libfdt-$(DTC_VERSION)) + + @$(foreach tool, $(DTC_BIN-y), \ + $(call install_copy, dtc, 0, 0, 0755, -, \ + /usr/bin/$(tool));) + + @$(call install_finish, dtc) + + @$(call touch) + +# vim: syntax=make -- 2.39.2
[ptxdist] [PATCH v3] dtc: new package
From: Ladislav Michl Please note this package is not as symmetrical as the typical host-* and normal variants. Here the latest version is usually needed. This work is prepping for qemu 8.2.0+, as it requires libfdt as a separate library. It has stopped providing one internally. Signed-off-by: Christian Melki Signed-off-by: Ladislav Michl --- CHANGES: -v2: select HOST_FLEX, drop 'v' from url version, update md5, use proper DTC_MAKE_ENV -v3: use ptx/nl, use osi-conform license rules/dtc.in | 37 +++ rules/dtc.make | 82 ++ 2 files changed, 119 insertions(+) create mode 100644 rules/dtc.in create mode 100644 rules/dtc.make diff --git a/rules/dtc.in b/rules/dtc.in new file mode 100644 index 0..e6d0b84d5 --- /dev/null +++ b/rules/dtc.in @@ -0,0 +1,37 @@ +## SECTION=system_libraries +menuconfig DTC + tristate + prompt "dtc " + select HOST_FLEX + help + Device Tree Compiler (dtc) toolchain. While dtc itself is + occasionally needed for device tree manipulaton on the + target, libfdt may be required. + +if DTC + +config DTC_DTC + bool + prompt "dtc" + +config DTC_DTDIFF + bool + prompt "dtdiff" + +config DTC_FDTDUMP + bool + prompt "fdtdump" + +config DTC_FDTGET + bool + prompt "fdtget" + +config DTC_FDTOVERLAY + bool + prompt "fdtoverlay" + +config DTC_FDTPUT + bool + prompt "fdtput" + +endif diff --git a/rules/dtc.make b/rules/dtc.make new file mode 100644 index 0..9075e11a6 --- /dev/null +++ b/rules/dtc.make @@ -0,0 +1,82 @@ +# -*-makefile-*- +# +# Copyright (C) 2022 Ladislav Michl +# Copyright (C) 2023 Christian Melki +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_DTC) += dtc + +# +# Paths and names +# +DTC_VERSION:= 1.7.0 +DTC_MD5:= f8b4469ad89f4b882091895ec60dde6b +DTC:= dtc-$(DTC_VERSION) +DTC_SUFFIX := tar.gz +DTC_URL:= https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(DTC).$(DTC_SUFFIX) +DTC_SOURCE := $(SRCDIR)/$(DTC).$(DTC_SUFFIX) +DTC_DIR:= $(BUILDDIR)/$(DTC) +DTC_LICENSE:= GPL-2.0-or-later OR BSD-2-Clause +DTC_LICENSE_FILES := \ + file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e \ + file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927 + +# +# Prepare +# + +DTC_CONF_TOOL := NO + +DTC_MAKE_ENV := $(CROSS_ENV) + +DTC_MAKE_OPT := \ + PREFIX=/usr \ + NO_PYTHON=1 \ + NO_VALGRIND=1 \ + NO_YAML=1 + +DTC_INSTALL_OPT:= \ + $(DTC_MAKE_OPT) \ + install-bin \ + install-includes \ + install-lib + +# +# Target-Install +# + +DTC_BIN-y := +DTC_BIN-$(PTXCONF_DTC_DTC) += dtc +DTC_BIN-$(PTXCONF_DTC_DTDIFF) += dtdiff +DTC_BIN-$(PTXCONF_DTC_FDTDUMP) += fdtdump +DTC_BIN-$(PTXCONF_DTC_FDTGET) += fdtget +DTC_BIN-$(PTXCONF_DTC_FDTOVERLAY) += fdtoverlay +DTC_BIN-$(PTXCONF_DTC_FDTPUT) += fdtput + +$(STATEDIR)/dtc.targetinstall: + @$(call targetinfo) + + @$(call install_init, dtc) + @$(call install_fixup, dtc,PRIORITY,optional) + @$(call install_fixup, dtc,SECTION,base) + @$(call install_fixup, dtc,AUTHOR,"Ladislav Michl ") + @$(call install_fixup, dtc,DESCRIPTION,missing) + + @$(call install_lib, dtc, 0, 0, 0644, libfdt-$(DTC_VERSION)) + + @$(foreach tool, $(DTC_BIN-y), \ + $(call install_copy, dtc, 0, 0, 0755, -, \ + /usr/bin/$(tool))$(ptx/nl)) + + @$(call install_finish, dtc) + + @$(call touch) + +# vim: syntax=make -- 2.39.2
[ptxdist] [PATCH] host-dtc: set make env
From: Ladislav Michl Signed-off-by: Ladislav Michl --- rules/host-dtc.make | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rules/host-dtc.make b/rules/host-dtc.make index 586b098bc..e1625ef91 100644 --- a/rules/host-dtc.make +++ b/rules/host-dtc.make @@ -28,15 +28,17 @@ HOST_DTC_LICENSE:= GPL-2.0-only # Prepare # -HOST_DTC_CONF_TOOL := NO -HOST_DTC_MAKE_OPT := \ +HOST_DTC_CONF_TOOL := NO + +HOST_DTC_MAKE_ENV := $(HOST_ENV) + +HOST_DTC_MAKE_OPT := \ PREFIX=/usr \ NO_PYTHON=1 \ NO_VALGRIND=1 \ - NO_YAML=1 \ - $(HOST_ENV_CC) + NO_YAML=1 -HOST_DTC_INSTALL_OPT := \ +HOST_DTC_INSTALL_OPT := \ $(HOST_DTC_MAKE_OPT) \ install-bin \ install-lib -- 2.39.2
Re: [ptxdist] [EXT] [PATCH] host-dtc: set make env
Hi Denis, On Mon, Jan 08, 2024 at 02:46:06PM +0100, Denis OSTERLAND-HEIM wrote: > Hi, > > what about using the target parameters here? > HOST_DTC_MAKE_OPT = $(DTC_MAKE_OPT) > HOST_DTC_INSTALL_OPT = $(DTC_INSTALL_OPT) The equality is pure coincidence here, so making them the same could cause troubes in the future if the need to change one of them arise. Best regards, ladis > Regards, Denis > > -Original Message- > From: ptxdist On Behalf Of Ladislav Michl > Sent: Friday, January 5, 2024 1:13 PM > To: ptxdist@pengutronix.de > Subject: [EXT] [ptxdist] [PATCH] host-dtc: set make env > > [EXTERNAL EMAIL] > > > From: Ladislav Michl > > Signed-off-by: Ladislav Michl > --- > rules/host-dtc.make | 12 +++- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/rules/host-dtc.make b/rules/host-dtc.make index > 586b098bc..e1625ef91 100644 > --- a/rules/host-dtc.make > +++ b/rules/host-dtc.make > @@ -28,15 +28,17 @@ HOST_DTC_LICENSE := GPL-2.0-only > # Prepare > # > > > -HOST_DTC_CONF_TOOL := NO > -HOST_DTC_MAKE_OPT := \ > +HOST_DTC_CONF_TOOL := NO > + > +HOST_DTC_MAKE_ENV:= $(HOST_ENV) > + > +HOST_DTC_MAKE_OPT:= \ > PREFIX=/usr \ > NO_PYTHON=1 \ > NO_VALGRIND=1 \ > - NO_YAML=1 \ > - $(HOST_ENV_CC) > + NO_YAML=1 > > -HOST_DTC_INSTALL_OPT := \ > +HOST_DTC_INSTALL_OPT := \ > $(HOST_DTC_MAKE_OPT) \ > install-bin \ > install-lib > -- > 2.39.2 >
Re: [ptxdist] [PATCH] libfdt: New package.
= dtc # # Paths and names # DTC_VERSION := 1.6.0 DTC_MD5 := cd36ac756290597f3cf1c5b6cfe12e77 DTC := dtc-v$(DTC_VERSION) DTC_SUFFIX := tar.gz DTC_URL := https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(DTC).$(DTC_SUFFIX) DTC_SOURCE := $(SRCDIR)/$(DTC).$(DTC_SUFFIX) DTC_DIR := $(BUILDDIR)/$(DTC) DTC_LICENSE := GPL-2.0-only # # Prepare # DTC_CONF_TOOL := NO DTC_MAKE_OPT := \ PREFIX=/usr \ NO_PYTHON=1 \ NO_VALGRIND=1 \ NO_YAML=1 \ $(CROSS_ENV_CC) DTC_INSTALL_OPT := \ $(DTC_MAKE_OPT) \ install-bin \ install-lib # # Target-Install # DTC_BIN-y := DTC_BIN-$(PTXCONF_DTC_DTC) += dtc DTC_BIN-$(PTXCONF_DTC_DTDIFF) += dtdiff DTC_BIN-$(PTXCONF_DTC_FDTDUMP) += fdtdump DTC_BIN-$(PTXCONF_DTC_FDTGET) += fdtget DTC_BIN-$(PTXCONF_DTC_FDTOVERLAY) += fdtoverlay DTC_BIN-$(PTXCONF_DTC_FDTPUT) += fdtput $(STATEDIR)/dtc.targetinstall: @$(call targetinfo) @$(call install_init, dtc) @$(call install_fixup, dtc,PRIORITY,optional) @$(call install_fixup, dtc,SECTION,base) @$(call install_fixup, dtc,AUTHOR,"Ladislav Michl ") @$(call install_fixup, dtc,DESCRIPTION,missing) @$(call install_lib, dtc, 0, 0, 0644, libfdt-$(DTC_VERSION)) @$(foreach tool, $(DTC_BIN-y), \ $(call install_copy, dtc, 0, 0, 0755, -, \ /usr/bin/$(tool));) @$(call install_finish, dtc) @$(call touch) # vim: syntax=make
Re: [ptxdist] [PATCH] libfdt: New package.
Hi Christian! On Thu, Jan 04, 2024 at 10:26:42AM +0100, Christian Melki wrote: > Hi Ladis, > > On 1/4/24 10:12 AM, Ladislav Michl wrote: > > Hi, > > > > On Wed, Jan 03, 2024 at 08:23:52PM +0100, Christian Melki wrote: > > > Add the device-tree-compiler source as libfdt. > > > I guess the package could have been named dtc as a target > > > variant with libfdt, but I don't know of any uses of the > > > dtc on target environments. > > > > Appended my version created about two years ago... Those DTC tools > > were used to patch devicetree during on field board upgrade when > > moving from ancient kernel. Flash repartioning was part of that > > upgrade as well as use of RAUC. Basically all userspace was moved > > to ramdisk, detached from flash, new image was prepared and flashed > > at once - single point of failure, board was dead when this failed, > > but as far as I know, it never happened. So yes, dtc on target > > environment is very usefull :) > > > > Oh. Didn't know you already had a version. > > I would probably have written my own tool using libfdt, > integrated into something else. :) > But that isn't saying there is no need for anyone. > > > > So the only use I can think of is libfdt. I think the name is more > > > accurate towards usage, but it isn't as symmetrical as the > > > typical host-* and normal variants. > > > > In case you reconsider, I'll merge your and my variant (I didn't > > bother with licenses as it was part of local BSP). > > I'll gladly reconsider. It's perfectly fine if there are usecases. > Please go ahead and do a merge if you like. > But keep binaries as optional. I prefer it that way. > > Either way, libfdt needs to happen on target because of qemu afaict. Yes. I expect qemu select DTC once someone (hint, hint) updates qemu :) Here's updated version, please give it a try. -- >8 -- Subject: [PATCH] dtc: new package From: Ladislav Michl Please note this package is not as symmetrical as the typical host-* and normal variants. Here the latest version is usually needed. This work is prepping for qemu 8.2.0+, as it requires libfdt as a separate library. It has stopped providing one internally. Signed-off-by: Christian Melki Signed-off-by: Ladislav Michl --- rules/dtc.in | 36 +++ rules/dtc.make | 80 ++ 2 files changed, 116 insertions(+) create mode 100644 rules/dtc.in create mode 100644 rules/dtc.make diff --git a/rules/dtc.in b/rules/dtc.in new file mode 100644 index 0..2edb6f925 --- /dev/null +++ b/rules/dtc.in @@ -0,0 +1,36 @@ +## SECTION=system_libraries +menuconfig DTC + tristate + prompt "dtc " + help + Device Tree Compiler (dtc) toolchain. While dtc itself is + occasionally needed for device tree manipulaton on the + target, libfdt may be required. + +if DTC + +config DTC_DTC + bool + prompt "dtc" + +config DTC_DTDIFF + bool + prompt "dtdiff" + +config DTC_FDTDUMP + bool + prompt "fdtdump" + +config DTC_FDTGET + bool + prompt "fdtget" + +config DTC_FDTOVERLAY + bool + prompt "fdtoverlay" + +config DTC_FDTPUT + bool + prompt "fdtput" + +endif diff --git a/rules/dtc.make b/rules/dtc.make new file mode 100644 index 0..d0e6a7617 --- /dev/null +++ b/rules/dtc.make @@ -0,0 +1,80 @@ +# -*-makefile-*- +# +# Copyright (C) 2022 Ladislav Michl +# Copyright (C) 2023 Christian Melki +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_DTC) += dtc + +# +# Paths and names +# +DTC_VERSION:= 1.7.0 +DTC_MD5:= 58f007905843f6ed6cecf820eeada0ef +DTC:= dtc-v$(DTC_VERSION) +DTC_SUFFIX := tar.gz +DTC_URL:= https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(DTC).$(DTC_SUFFIX) +DTC_SOURCE := $(SRCDIR)/$(DTC).$(DTC_SUFFIX) +DTC_DIR:= $(BUILDDIR)/$(DTC) +DTC_LICENSE:= BSD-2-Clause OR GPL-2.0 +DTC_LICENSE_FILES := \ + file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e \ + file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927 + +# +# Prepare +# + +DTC_CONF_TOOL := NO +DTC_MAKE_OPT := \ + PREFIX=/usr \ + NO_PYTHON=1 \ + NO_VALGRIND=1 \ + NO_YAML=1 \ + $(CROSS_ENV_CC) + +DTC_INSTALL_OPT := \ +
Re: [ptxdist] [ANNOUNCE] OSELAS.Toolchain() 2022.10.2 and 2023.07.1 released
On Thu, Dec 21, 2023 at 10:38:16AM +0100, Michael Olbrich wrote: > Hi, > > On Wed, Dec 20, 2023 at 05:48:31PM +0100, Ladislav Michl wrote: > > On Tue, Nov 21, 2023 at 08:46:31AM +0100, Michael Olbrich wrote: > > > I'm happy to announce that I've just released OSELAS.Toolchain-2022.10.2 > > > and 2023.07.1. > > > > > > This is a bugfix only release. There are no major update. The relevant > > > changes are: > > > > > > - gcc was updated to the 12-20231117 and 13-20231118 snapshot releases. > > >Note, that for the 2023.07.1 toolchain the reported version is now > > >13.2.1 so the platformconfig in PTXdist BSPs must be updated > > >accordingly. > > > - glibc was updated to 2.36-121-g88d5d70b1e89 and 2.37-48-g8e20aedfd7fc > > > in > > >the respective stable branch. > > > - All patches from the binutils stable branches that seemed relevant > > >have been cherry-picked. > > > - The gcc fortran compiler is now enabled in all Linux toolchains > > > > > > Download the release here: > > > https://public.pengutronix.de/oselas/toolchain/ > > > > > > Debian / Ubuntu Packages will be available at > > > http://debian.pengutronix.de/ > > > > I finally got time to update all my BSPs to newer toolchain. However, it > > does > > not fly without force-overwrite: > > ladis@lenoch:~$ sudo dpkg --force-overwrite -i > > /var/cache/apt/archives/oselas.toolchain-2023.07.1-arm-v7a-linux-gnueabi-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym_2023.07.1-1~deb12+1_amd64.deb > > > > (Reading database ... 621067 files and directories currently installed.) > > Preparing to unpack > > .../oselas.toolchain-2023.07.1-arm-v7a-linux-gnueabi-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym_2023.07.1-1~deb12+1_amd64.deb > > ... > > Unpacking > > oselas.toolchain-2023.07.1-arm-v7a-linux-gnueabi-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym > > (2023.07.1-1~deb12+1) ... > > dpkg: warning: overriding problem because --force enabled: > > dpkg: warning: trying to overwrite > > '/usr/lib/debug/.build-id/0c/9b7ee1580684fbdac23548ca46c1c34408e49b.debug', > > which is also in package > > oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym > > 2023.07.1-1~deb12+1 > [...] > > Don't install the *-dbgsym packages unless you really need them. They > contain the debug symbols for the compiler itself etc. not the target > libraries. So you will only need them if you want to debug a crashing gcc > or something like that. Thanks, that's what I was doing, but turned out problem was too much pressure on VM on build host, so random crashes occured. > I'm not sure what those debug files are for, but my guess ist libLLVM.so > or something like that. Stuff that does not change with the selected target > architecture. And the builds are sufficiently reproducible that the > build-id is the same. Ah, that is very nice gotcha ;-) > Regards, > Michael Thank you, ladis
[ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12
From: Ladislav Michl Move package to a new upstream at https://github.com/spkr-beep/beep/ Signed-off-by: Ladislav Michl --- rules/beep.make | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/rules/beep.make b/rules/beep.make index 69ab02f1a..06c42ce37 100644 --- a/rules/beep.make +++ b/rules/beep.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_BEEP) += beep # # Paths and names # -BEEP_VERSION := 1.3 -BEEP_MD5 := 49c340ceb95dbda3f97b2daafac7892a +BEEP_VERSION := 1.4.12 +BEEP_MD5 := a817f05c5473a23d700778b2c0108cc4 BEEP := beep-$(BEEP_VERSION) BEEP_SUFFIX:= tar.gz -BEEP_URL := http://www.johnath.com/beep/$(BEEP).$(BEEP_SUFFIX) +BEEP_URL := https://github.com/spkr-beep/beep/archive/refs/tags/v$(BEEP_VERSION).$(BEEP_SUFFIX) BEEP_SOURCE:= $(SRCDIR)/$(BEEP).$(BEEP_SUFFIX) BEEP_DIR := $(BUILDDIR)/$(BEEP) BEEP_LICENSE := GPL-2.0-only @@ -28,7 +28,17 @@ BEEP_LICENSE := GPL-2.0-only # BEEP_CONF_TOOL := NO -BEEP_MAKE_OPT := CC=$(CROSS_CC) +BEEP_MAKE_OPT := \ + CC=$(CROSS_CC) \ + prefix=/usr + +# +# Install +# + +BEEP_INSTALL_OPT := \ + prefix=/usr \ + install # # Target-Install -- 2.39.2
[ptxdist] [PATCH 1/2] Revert "beep: move to staging"
From: Ladislav Michl This reverts commit 56ddc68d6cada7fee791122e27d4b2388dc8715d as original upstream is indeed dead, but project continues to live at a new location and subsequent patch will update it. Signed-off-by: Ladislav Michl --- rules/beep.in | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/rules/beep.in b/rules/beep.in index 6c9ea8532..52abcd11e 100644 --- a/rules/beep.in +++ b/rules/beep.in @@ -1,12 +1,7 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_sound +## SECTION=multimedia_sound config BEEP tristate prompt "beep" help Extended beep utility - - STAGING: remove in PTXdist 2025.05.0 - Unmaintained in PTXdist. Original upstream and URL are dead. -- 2.39.2
[ptxdist] [PATCH] at91bootstrap: drop atmel download url
From: Ladislav Michl Atmel url just redirects to https://www.microchip.com/ happily feeding tarball with content, so drop it entirely. Signed-off-by: Ladislav Michl --- rules/at91bootstrap.make | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rules/at91bootstrap.make b/rules/at91bootstrap.make index 7835564ea..1dfabdcbf 100644 --- a/rules/at91bootstrap.make +++ b/rules/at91bootstrap.make @@ -20,9 +20,7 @@ AT91BOOTSTRAP_MD5 := 2d222312cf0af81c56db8747d6a38c7c AT91BOOTSTRAP_SUFFIX := zip AT91BOOTSTRAP := Bootstrap-v$(AT91BOOTSTRAP_VERSION) AT91BOOTSTRAP_TARBALL := AT91Bootstrap$(AT91BOOTSTRAP_VERSION).$(AT91BOOTSTRAP_SUFFIX) -AT91BOOTSTRAP_URL := \ - http://www.atmel.com/dyn/resources/prod_documents/$(AT91BOOTSTRAP_TARBALL) \ -http://sources.buildroot.net/$(AT91BOOTSTRAP_TARBALL) +AT91BOOTSTRAP_URL := http://sources.buildroot.net/$(AT91BOOTSTRAP_TARBALL) AT91BOOTSTRAP_SOURCE := $(SRCDIR)/$(AT91BOOTSTRAP_TARBALL) AT91BOOTSTRAP_DIR := $(BUILDDIR)/$(AT91BOOTSTRAP) AT91BOOTSTRAP_LICENSE := BSD-Source-Code AND GPL-2.0-or-later -- 2.39.2
[ptxdist] [PATCH v2] beep: version bump 1.3 -> 1.4.12
From: Ladislav Michl Move package to a new upstream at https://github.com/spkr-beep/beep/ Signed-off-by: Ladislav Michl --- CHANGES: - v2: Add prepare rule to avoid dependencies on additional libraries (beep's GNUMakefile is trying to be smart, but lacks handling consequences) rules/beep.make | 26 ++ 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/rules/beep.make b/rules/beep.make index 69ab02f1a..234a3513f 100644 --- a/rules/beep.make +++ b/rules/beep.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_BEEP) += beep # # Paths and names # -BEEP_VERSION := 1.3 -BEEP_MD5 := 49c340ceb95dbda3f97b2daafac7892a +BEEP_VERSION := 1.4.12 +BEEP_MD5 := a817f05c5473a23d700778b2c0108cc4 BEEP := beep-$(BEEP_VERSION) BEEP_SUFFIX:= tar.gz -BEEP_URL := http://www.johnath.com/beep/$(BEEP).$(BEEP_SUFFIX) +BEEP_URL := https://github.com/spkr-beep/beep/archive/refs/tags/v$(BEEP_VERSION).$(BEEP_SUFFIX) BEEP_SOURCE:= $(SRCDIR)/$(BEEP).$(BEEP_SUFFIX) BEEP_DIR := $(BUILDDIR)/$(BEEP) BEEP_LICENSE := GPL-2.0-only @@ -28,7 +28,25 @@ BEEP_LICENSE := GPL-2.0-only # BEEP_CONF_TOOL := NO -BEEP_MAKE_OPT := CC=$(CROSS_CC) +BEEP_MAKE_OPT := \ + CC=$(CROSS_CC) \ + prefix=/usr + +$(STATEDIR)/beep.prepare: + @$(call targetinfo) + # Override detected CFLAGS as some of them may require linking + # with additional libraries (-lubsan and -latomic) + @echo "common_CFLAGS = -std=gnu99 -pedantic"> $(BEEP_DIR)/local.mk + @echo "CFLAGS = -O2 -g -save-temps=obj" >> $(BEEP_DIR)/local.mk + @$(call touch) + +# +# Install +# + +BEEP_INSTALL_OPT := \ + prefix=/usr \ + install # # Target-Install -- 2.39.2
Re: [ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12
On Tue, Apr 23, 2024 at 07:36:52AM +0200, Ladislav Michl wrote: > Move package to a new upstream at https://github.com/spkr-beep/beep/ For v5te I needed to add LDFLAGS=-latomic to satisfy undefined reference: arm-v5te-linux-gnueabi-gcc -Wl,-Map=beep.map,--cref -fasynchronous-unwind-tables -fanalyzer -fstack-protector-strong -fstack-clash-protection -fsanitize=undefined -save-temps=obj -O2 -g -std=gnu99 -pedantic -Wall -Wextra -Werror -Wno-padded -Wno-format-nonliteral -o beep beep-log.o beep-main.o beep-library.o beep-usage.o beep-drivers.o beep-driver-console.o beep-driver-evdev.o /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: undefined reference to `__atomic_compare_exchange_8' /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: undefined reference to `__atomic_load_8' collect2: error: ld returned 1 exit status I can see haproxy and dhcp packages are adding target flags based on selected architecture. Is it to way to follow here? l.
Re: [ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12
On Thu, May 02, 2024 at 11:38:14AM +0200, Michael Olbrich wrote: > On Wed, Apr 24, 2024 at 05:33:22PM +0200, Ladislav Michl wrote: > > On Tue, Apr 23, 2024 at 07:36:52AM +0200, Ladislav Michl wrote: > > > Move package to a new upstream at https://github.com/spkr-beep/beep/ > > > > For v5te I needed to add LDFLAGS=-latomic to satisfy undefined reference: > > arm-v5te-linux-gnueabi-gcc -Wl,-Map=beep.map,--cref > > -fasynchronous-unwind-tables -fanalyzer -fstack-protector-strong > > -fstack-clash-protection -fsanitize=undefined -save-temps=obj -O2 -g > > -std=gnu99 -pedantic -Wall -Wextra -Werror -Wno-padded > > -Wno-format-nonliteral -o beep beep-log.o beep-main.o beep-library.o > > beep-usage.o beep-drivers.o beep-driver-console.o beep-driver-evdev.o > > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: > > > > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: > > undefined reference to `__atomic_compare_exchange_8' > > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: > > > > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: > > undefined reference to `__atomic_load_8' > > collect2: error: ld returned 1 exit status > > > > I can see haproxy and dhcp packages are adding target flags based on > > selected architecture. Is it to way to follow here? > > Yes, please handle it like that. If it's missing for other architectures > (ppc is a possibility here), I'll fix it when it fails in my tests. I already sent v2 with different approach. Problems boils down to beep's GNUMakefile trying to figure out whenever compiler supports various sanitizers flags, but fails to figure out, that it comes at price linking with sanitizer libraries on some architectures. V2 solves that by removing all those checks, so external libraries are no longer needed. ladis
