Skip to contentSkip to conversation

Add dosfstools recipe

PATCH In review [email protected] 3 participants 6 messages Sep 28, 2023 – Sep 30, 2024 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

v4 cover Add dosfstools recipe

From: venkata pyla <[email protected]>

Hi,

This patch series add recipe that build custom dosfstools and use it for creating reproducible DOS images.

v4 changes:
- dosfstools: Add recipe to build it locally
(No change)
- distro: Set dosfstools as build dependency
Removed dependency for buster release

v3 changes:
- dosfstools: Add recipe to build it locally (Remove dosfstools dependency from reproucible option)
- distro: Set dosfstools as build dependency (new commit)

v2 changes:
dosfstools: Add recipe to build it locally

     (modified from `dpkg-gbp` to `apt://`)

images: Add dosfstools as DEPENDENCY to all images
(new commit)

 conf/distro/cip-core-common.inc               |   3 +
 .../dosfstools/dosfstools_latest.bb           |  28 +++
 ...Honor-the-SOURCE_DATE_EPOCH-variable.patch | 160 ++++++++++++++++++
 3 files changed, 191 insertions(+)
 create mode 100644 recipes-devtools/dosfstools/dosfstools_latest.bb
 create mode 100644 recipes-devtools/dosfstools/files/0001-Honor-the-SOURCE_DATE_EPOCH-variable.patch
Signature · 1 line
2.20.1
#2 lore raw
Quoted 25 lines · On 28.09.23 08:44, [email protected] wrote:

From: venkata pyla <[email protected]>

Hi,

This patch series add recipe that build custom dosfstools and use it for creating reproducible DOS images.

v4 changes:
- dosfstools: Add recipe to build it locally
(No change)
- distro: Set dosfstools as build dependency
Removed dependency for buster release

v3 changes:
- dosfstools: Add recipe to build it locally (Remove dosfstools dependency from reproucible option)
- distro: Set dosfstools as build dependency (new commit)

v2 changes:
dosfstools: Add recipe to build it locally

     (modified from `dpkg-gbp` to `apt://`)

images: Add dosfstools as DEPENDENCY to all images
(new commit)

Quoted 7 lines
 conf/distro/cip-core-common.inc               |   3 +
 .../dosfstools/dosfstools_latest.bb           |  28 +++
 ...Honor-the-SOURCE_DATE_EPOCH-variable.patch | 160 ++++++++++++++++++
 3 files changed, 191 insertions(+)
 create mode 100644 recipes-devtools/dosfstools/dosfstools_latest.bb
 create mode 100644 recipes-devtools/dosfstools/files/0001-Honor-the-SOURCE_DATE_EPOCH-variable.patch

Thanks, patches updated in next.

Jan

Signature · 2 lines
Siemens AG, Technology
Linux Expert Center
#3 lore raw
In reply to [email protected]
Quoted 7 lines · On Thu, 2023-09-28 at 12:14 +0530, [email protected] wrote:

From: venkata pyla <[email protected]>

Hi,

This patch series add recipe that build custom dosfstools and use it for
creating reproducible DOS images.

Hi,

I revisited this while debugging reproducible builds issues in ISAR:
Have there been any attempts to upstream this? The dosfstools repo seems to be abandoned, but maybe Debian would be willing to accept this patch.

Apart from that, we might want to move this recipe over to ISAR, as all EFI targets are not reproducible due to this.

Best regards,
Felix Moessbauer

Quoted 28 lines

v4 changes:
  - dosfstools: Add recipe to build it locally
        (No change)
  - distro: Set dosfstools as build dependency
        Removed dependency for buster release

v3 changes:
  - dosfstools: Add recipe to build it locally (Remove dosfstools dependency from reproucible option)
  - distro: Set dosfstools as build dependency (new commit)

v2 changes:
  dosfstools: Add recipe to build it locally (modified from dpkg-gbp to apt://)
  images: Add dosfstools as DEPENDENCY to all images (new commit)

 conf/distro/cip-core-common.inc               |   3 + .../dosfstools/dosfstools_latest.bb           |  28 +++ ...Honor-the-SOURCE_DATE_EPOCH-variable.patch | 160
++++++++++++++++++

 3 files changed, 191 insertions(+)

 create mode 100644 recipes-devtools/dosfstools/dosfstools_latest.bb create mode 100644 recipes-devtools/dosfstools/files/0001-Honor-the- SOURCE_DATE_EPOCH-variable.patch

Signature · 2 lines
Siemens AG, Technology
Linux Expert Center
#4 lore raw
Quoted 9 lines · Felix (T CED OES-DE)
Quoted 7 lines · On Thu, 2023-09-28 at 12:14 +0530, [email protected] wrote:

From: venkata pyla <[email protected]>

Hi,

This patch series add recipe that build custom dosfstools and use it for
creating reproducible DOS images.

Quoted 7 lines

Hi,

I revisited this while debugging reproducible builds issues in ISAR:
Have there been any attempts to upstream this? The dosfstools repo seems to be abandoned, but maybe Debian would be willing to accept this patch.

Problem is tracked here: https://github.com/dosfstools/dosfstools/issues/210

Quoted 2 lines

Apart from that, we might want to move this recipe over to ISAR, as all EFI targets are not reproducible due to this.

If things continue to evolve - or, rather, do not - like they did so far, this is actually a way for us to side-step them for a moment. Still, that brings more responsibility for us regarding maintenance.

Jan

Signature · 2 lines
Siemens AG, Technology
Linux Expert Center
#5 lore raw

PATCH v4 1/2 dosfstools: Add recipe to build it locally

In reply to a message not in the archive

From: venkata pyla <[email protected]>

mkdosfs doesn't generate fat file-systems reproducibly, due to the reason that the utility mkfs.fat is not honoring the variable SOURCE_DATE_EPOCH and including build time stamps in the file system headers, this issue has been fixed in upstream master branch but not release yet, so building it locally with the patch.

This local build can be dropped when this patch[1] is available in Debian releases, issue[2] is already available to make release with this patch.

[1] https://github.com/dosfstools/dosfstools/commit/8da7bc93315cb0c32ad868f17808468b81fa76ec
[2] https://github.com/dosfstools/dosfstools/issues/179

---
 .../dosfstools/dosfstools_latest.bb           |  28 +++
 ...Honor-the-SOURCE_DATE_EPOCH-variable.patch | 160 ++++++++++++++++++
 2 files changed, 188 insertions(+)
 create mode 100644 recipes-devtools/dosfstools/dosfstools_latest.bb
 create mode 100644 recipes-devtools/dosfstools/files/0001-Honor-the-SOURCE_DATE_EPOCH-variable.patch
recipes-devtools/dosfstools/dosfstools_latest.bb new file +28 -0
new file mode 100644
index 0000000..ebdf983
@@ -0,0 +1,28 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Toshiba Corporation 2023
+#
+# Authors:
+#  Venkata Pyla <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit dpkg
+
+CHANGELOG_V="<orig-version>+cip"
+
+SRC_URI = "apt://${PN}"
+SRC_URI += "file://0001-Honor-the-SOURCE_DATE_EPOCH-variable.patch;apply=no"
+
+# this is a host tool
+PACKAGE_ARCH = "${HOST_ARCH}"
+
+do_prepare_build() {
+	deb_add_changelog
+
+	cd ${S}
+	quilt import ${WORKDIR}/*.patch
+	quilt push -a
+}
recipes-devtools/dosfstools/files/0001-Honor-the-SOURCE_DATE_EPOCH-variable.patch new file +160 -0

160 lines not on this page · raw message

Signature · 1 line
2.20.1
#6 lore raw

PATCH v4 2/2 distro: Set dosfstools as build dependency

In reply to a message not in the archive

From: venkata pyla <[email protected]>

custom dosfstools is included with fix that will help create DOS images reproducibly.

This is excluded for buster because the patch cannot be applied and also reproducible build is not important in buster.

---
 conf/distro/cip-core-common.inc | 3 +++
 1 file changed, 3 insertions(+)
conf/distro/cip-core-common.inc +3 -0
index 5d3ce10..3ae2a3e 100644
@@ -14,3 +14,6 @@ KERNEL_NAME ?= "cip"
 WKS_FILE ?= "${MACHINE}.wks"
 
 CIP_IMAGE_OPTIONS ?= ""
+
+IMAGER_BUILD_DEPS ?= "dosfstools"
+IMAGER_BUILD_DEPS:remove:buster = "dosfstools"
Signature · 1 line
2.20.1