From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 01/17] btrfs-progs: New package
Date: Tue, 19 Mar 2024 20:53:27 +0100
Message-ID: <492e31626db6e98403a9515644221680be9990d3.camel@ipfire.org>
In-Reply-To: <7498BA41-B3FC-4D5A-A09F-021371770AC9@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6263859992990698827=="
List-Id: <development.lists.ipfire.org>

--===============6263859992990698827==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello Michael,

thanks for pointing this out.

I forgot to commit the changes in the initramdisk, which also should
contain everything btrfs related.

I also need to double check if I correctly commited the include of
mkfs.btrfs in the initramdisk of the installer.

- Stefan=20
> Hello,
>=20
> Did you consider that our initramdisk will grow a little bit more
> with these tools?
>=20
> You probably want to enable the btrfs module in dracut, as we
> currently don=E2=80=99t ship this:
>=20
> config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs
> config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/80-
> btrfs.rules
> config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/btrf
> s_device_ready.sh
> config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/btrf
> s_finished.sh
> config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/btrf
> s_timeout.sh
> config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/modu
> le-setup.sh
>=20
> -Michael
>=20
> > On 15 Mar 2024, at 19:14, Stefan Schantl
> > <stefan.schantl(a)ipfire.org> wrote:
> >=20
> > Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> > ---
> > config/rootfiles/common/btrfs-progs | 33 +++++++++++
> > lfs/btrfs-progs=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 85
> > +++++++++++++++++++++++++++++
> > make.sh=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 1 +
> > 3 files changed, 119 insertions(+)
> > create mode 100644 config/rootfiles/common/btrfs-progs
> > create mode 100644 lfs/btrfs-progs
> >=20
> > diff --git a/config/rootfiles/common/btrfs-progs
> > b/config/rootfiles/common/btrfs-progs
> > new file mode 100644
> > index 000000000..04af32d3f
> > --- /dev/null
> > +++ b/config/rootfiles/common/btrfs-progs
> > @@ -0,0 +1,33 @@
> > +lib/udev/rules.d/64-btrfs-dm.rules
> > +lib/udev/rules.d/64-btrfs-zoned.rules
> > +usr/bin/btrfs
> > +usr/bin/btrfs-convert
> > +usr/bin/btrfs-find-root
> > +usr/bin/btrfs-image
> > +usr/bin/btrfs-map-logical
> > +usr/bin/btrfs-select-super
> > +usr/bin/btrfsck
> > +usr/bin/btrfstune
> > +usr/bin/fsck.btrfs
> > +usr/bin/mkfs.btrfs
> > +#usr/include/btrfs
> > +#usr/include/btrfs/ctree.h
> > +#usr/include/btrfs/ioctl.h
> > +#usr/include/btrfs/kerncompat.h
> > +#usr/include/btrfs/list.h
> > +#usr/include/btrfs/rbtree.h
> > +#usr/include/btrfs/rbtree_types.h
> > +#usr/include/btrfs/send-stream.h
> > +#usr/include/btrfs/send-utils.h
> > +#usr/include/btrfs/send.h
> > +#usr/include/btrfs/version.h
> > +#usr/include/btrfsutil.h
> > +#usr/lib/libbtrfs.a
> > +#usr/lib/libbtrfs.so
> > +usr/lib/libbtrfs.so.0
> > +usr/lib/libbtrfs.so.0.1
> > +#usr/lib/libbtrfsutil.a
> > +#usr/lib/libbtrfsutil.so
> > +usr/lib/libbtrfsutil.so.1
> > +usr/lib/libbtrfsutil.so.1.2.0
> > +#usr/lib/pkgconfig/libbtrfsutil.pc
> > diff --git a/lfs/btrfs-progs b/lfs/btrfs-progs
> > new file mode 100644
> > index 000000000..caf8f0b96
> > --- /dev/null
> > +++ b/lfs/btrfs-progs
> > @@ -0,0 +1,85 @@
> > +##################################################################
> > #############
> > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +# IPFire.org - A linux based
> > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +# Copyright (C) 2007-2023=C2=A0 IPFire Team=C2=A0
> > <info(a)ipfire.org>=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +# This program is free software: you can redistribute it and/or
> > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +# it under the terms of the GNU General Public License as
> > published by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +# the Free Software Foundation, either version 3 of the License,
> > or=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +# (at your option) any later
> > version.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +# This program is distributed in the hope that it will be
> > useful,=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 #
> > +# but WITHOUT ANY WARRANTY; without even the implied warranty
> > of=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0 #
> > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.=C2=A0 See
> > the=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 #
> > +# GNU General Public License for more
> > details.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +# You should have received a copy of the GNU General Public
> > License=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +# along with this program.=C2=A0 If not, see
> > <http://www.gnu.org/licenses/>.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0
> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
> > +##################################################################
> > #############
> > +
> > +##################################################################
> > #############
> > +# Definitions
> > +##################################################################
> > #############
> > +
> > +include Config
> > +
> > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 6.7.1
> > +
> > +THISAPP=C2=A0=C2=A0=C2=A0 =3D btrfs-progs-v$(VER)
> > +DL_FILE=C2=A0=C2=A0=C2=A0 =3D $(THISAPP).tar.xz
> > +DL_FROM=C2=A0=C2=A0=C2=A0 =3D $(URL_IPFIRE)
> > +DIR_APP=C2=A0=C2=A0=C2=A0 =3D $(DIR_SRC)/$(THISAPP)
> > +TARGET=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(DIR_INFO)/$(THISAPP)
> > +
> > +##################################################################
> > #############
> > +# Top-level Rules
> > +##################################################################
> > #############
> > +
> > +objects =3D $(DL_FILE)
> > +
> > +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
> > +
> > +$(DL_FILE)_BLAKE2 =3D
> > 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3
> > ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0
> > +
> > +install : $(TARGET)
> > +
> > +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> > +
> > +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> > +
> > +b2 : $(subst %,%_BLAKE2,$(objects))
> > +
> > +dist:
> > + @$(PAK)
> > +
> > +##################################################################
> > #############
> > +# Downloading, checking, b2sum
> > +##################################################################
> > #############
> > +
> > +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> > + @$(CHECK)
> > +
> > +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> > + @$(LOAD)
> > +
> > +$(subst %,%_BLAKE2,$(objects)) :
> > + @$(B2SUM)
> > +
> > +##################################################################
> > #############
> > +# Installation Details
> > +##################################################################
> > #############
> > +
> > +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> > + @$(PREBUILD)
> > + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf
> > $(DIR_DL)/$(DL_FILE)
> > + $(UPDATE_AUTOMAKE)
> > + cd $(DIR_APP) && ./autogen.sh
> > + cd $(DIR_APP) && ./configure \
> > + --prefix=3D/usr \
> > + --disable-documentation \
> > + --disable-python
> > + cd $(DIR_APP) && make $(MAKETUNING)
> > + cd $(DIR_APP) && make install
> > + @rm -rf $(DIR_APP)
> > + @$(POSTBUILD)
> > diff --git a/make.sh b/make.sh
> > index 7b56b7fc8..7e3ea09d1 100755
> > --- a/make.sh
> > +++ b/make.sh
> > @@ -1711,6 +1711,7 @@ buildipfire() {
> > =C2=A0 lfsmake2 perl-URI-Encode
> > =C2=A0 lfsmake2 rsnapshot
> > =C2=A0 lfsmake2 mympd
> > +=C2=A0 lfsmake2 btrfs-progs
> >=20
> > =C2=A0 # Kernelbuild ... current we have no platform that need
> > =C2=A0 # multi kernel builds so KCFG is empty
> > --=20
> > 2.39.2
> >=20
>=20


--===============6263859992990698827==--