diff mbox series

[01/17] btrfs-progs: New package

Message ID 20240315191442.3951-2-stefan.schantl@ipfire.org
State Superseded
Headers
Series BTRFS support on IPFire 2.x (experimental) |

Commit Message

Stefan Schantl March 15, 2024, 7:14 p.m. UTC 
  Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 config/rootfiles/common/btrfs-progs | 33 +++++++++++
 lfs/btrfs-progs                     | 85 +++++++++++++++++++++++++++++
 make.sh                             |  1 +
 3 files changed, 119 insertions(+)
 create mode 100644 config/rootfiles/common/btrfs-progs
 create mode 100644 lfs/btrfs-progs

Comments

Michael Tremer March 18, 2024, 4:02 p.m. UTC | #1 
Hello,

Did you consider that our initramdisk will grow a little bit more with these tools?

You probably want to enable the btrfs module in dracut, as we currently don’t ship this:

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/btrfs_device_ready.sh
config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/btrfs_finished.sh
config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/btrfs_timeout.sh
config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/module-setup.sh

-Michael

> On 15 Mar 2024, at 19:14, Stefan Schantl <stefan.schantl@ipfire.org> wrote:
> 
> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> ---
> config/rootfiles/common/btrfs-progs | 33 +++++++++++
> lfs/btrfs-progs                     | 85 +++++++++++++++++++++++++++++
> make.sh                             |  1 +
> 3 files changed, 119 insertions(+)
> create mode 100644 config/rootfiles/common/btrfs-progs
> create mode 100644 lfs/btrfs-progs
> 
> 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 @@
> +###############################################################################
> +#                                                                             #
> +# IPFire.org - A linux based firewall                                         #
> +# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
> +#                                                                             #
> +# This program is free software: you can redistribute it and/or modify        #
> +# it under the terms of the GNU General Public License as published by        #
> +# the Free Software Foundation, either version 3 of the License, or           #
> +# (at your option) any later version.                                         #
> +#                                                                             #
> +# This program is distributed in the hope that it will be useful,             #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
> +# GNU General Public License for more details.                                #
> +#                                                                             #
> +# You should have received a copy of the GNU General Public License           #
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
> +#                                                                             #
> +###############################################################################
> +
> +###############################################################################
> +# Definitions
> +###############################################################################
> +
> +include Config
> +
> +VER        = 6.7.1
> +
> +THISAPP    = btrfs-progs-v$(VER)
> +DL_FILE    = $(THISAPP).tar.xz
> +DL_FROM    = $(URL_IPFIRE)
> +DIR_APP    = $(DIR_SRC)/$(THISAPP)
> +TARGET     = $(DIR_INFO)/$(THISAPP)
> +
> +###############################################################################
> +# Top-level Rules
> +###############################################################################
> +
> +objects = $(DL_FILE)
> +
> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_BLAKE2 = 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0
> +
> +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=/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() {
>   lfsmake2 perl-URI-Encode
>   lfsmake2 rsnapshot
>   lfsmake2 mympd
> +  lfsmake2 btrfs-progs
> 
>   # Kernelbuild ... current we have no platform that need
>   # multi kernel builds so KCFG is empty
> -- 
> 2.39.2
>
Stefan Schantl March 19, 2024, 7:53 p.m. UTC | #2 
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 
> Hello,
> 
> Did you consider that our initramdisk will grow a little bit more
> with these tools?
> 
> You probably want to enable the btrfs module in dracut, as we
> currently don’t ship this:
> 
> 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
> 
> -Michael
> 
> > On 15 Mar 2024, at 19:14, Stefan Schantl
> > <stefan.schantl@ipfire.org> wrote:
> > 
> > Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> > ---
> > config/rootfiles/common/btrfs-progs | 33 +++++++++++
> > lfs/btrfs-progs                     | 85
> > +++++++++++++++++++++++++++++
> > make.sh                             |  1 +
> > 3 files changed, 119 insertions(+)
> > create mode 100644 config/rootfiles/common/btrfs-progs
> > create mode 100644 lfs/btrfs-progs
> > 
> > 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 @@
> > +##################################################################
> > #############
> > +#                                                                 
> >             #
> > +# IPFire.org - A linux based
> > firewall                                         #
> > +# Copyright (C) 2007-2023  IPFire Team 
> > <info@ipfire.org>                     #
> > +#                                                                 
> >             #
> > +# This program is free software: you can redistribute it and/or
> > modify        #
> > +# it under the terms of the GNU General Public License as
> > published by        #
> > +# the Free Software Foundation, either version 3 of the License,
> > or           #
> > +# (at your option) any later
> > version.                                         #
> > +#                                                                 
> >             #
> > +# This program is distributed in the hope that it will be
> > useful,             #
> > +# but WITHOUT ANY WARRANTY; without even the implied warranty
> > of              #
> > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
> > the               #
> > +# GNU General Public License for more
> > details.                                #
> > +#                                                                 
> >             #
> > +# You should have received a copy of the GNU General Public
> > License           #
> > +# along with this program.  If not, see
> > <http://www.gnu.org/licenses/>.       #
> > +#                                                                 
> >             #
> > +##################################################################
> > #############
> > +
> > +##################################################################
> > #############
> > +# Definitions
> > +##################################################################
> > #############
> > +
> > +include Config
> > +
> > +VER        = 6.7.1
> > +
> > +THISAPP    = btrfs-progs-v$(VER)
> > +DL_FILE    = $(THISAPP).tar.xz
> > +DL_FROM    = $(URL_IPFIRE)
> > +DIR_APP    = $(DIR_SRC)/$(THISAPP)
> > +TARGET     = $(DIR_INFO)/$(THISAPP)
> > +
> > +##################################################################
> > #############
> > +# Top-level Rules
> > +##################################################################
> > #############
> > +
> > +objects = $(DL_FILE)
> > +
> > +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> > +
> > +$(DL_FILE)_BLAKE2 =
> > 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=/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() {
> >   lfsmake2 perl-URI-Encode
> >   lfsmake2 rsnapshot
> >   lfsmake2 mympd
> > +  lfsmake2 btrfs-progs
> > 
> >   # Kernelbuild ... current we have no platform that need
> >   # multi kernel builds so KCFG is empty
> > -- 
> > 2.39.2
> > 
>
diff mbox series

Patch

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 @@ 
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 6.7.1
+
+THISAPP    = btrfs-progs-v$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0
+
+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=/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() {
   lfsmake2 perl-URI-Encode
   lfsmake2 rsnapshot
   lfsmake2 mympd
+  lfsmake2 btrfs-progs
 
   # Kernelbuild ... current we have no platform that need
   # multi kernel builds so KCFG is empty