Merge pull request 'Make emerge ignore rebuilds' (#444 ) from folkmaster/lbmk:master into master

Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/444
Merge pull request 'Fix Git identity handling in xbmk_git_init' (#445 ) from zoomm10/lbmk:fix-git-identity into master
2026-09-19 21:20:31 +02:00 · 2026-07-28 03:26:10 +02:00 · 2026-07-28 03:23:41 +02:00 · 2026-07-28 03:02:02 +02:00 · 2026-07-25 01:36:59 +02:00 · 2026-07-25 01:35:53 +02:00
5 changed files with 11 additions and 9 deletions
@@ -6,7 +6,7 @@ acpica arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib \
 autogen base-devel bison cdrtools cmake curl device-mapper doxygen \
 dtc e2fsprogs flex freetype2 fuse2 gawk gcc-ada gdb gettext git \
 help2man innoextract libftdi libgpiod libjaylink libpciaccess libusb nasm \
-ncurses openssl p7zip ccache less libx86 \
+ncurses openssl 7zip ccache less libx86 \
 pandoc parted pciutils perl perl-libwww python python-setuptools rsync \
 sharutils subversion swig texinfo ttf-dejavu unarchiver unzip wget xz zlib mtools \
 "
@@ -10,7 +10,7 @@ libfdt-dev libfont-freetype-perl libfreetype-dev libftdi-dev libftdi1-dev libfus
 libjaylink-dev libgnutls28-dev libgpiod-dev lz4 liblz4-dev liblzma-dev libncurses5-dev \
 libncurses-dev libnewlib-arm-none-eabi libopts25 libopts25-dev libpci-dev libpython3-dev \
 libsdl2-dev libselinux1-dev libssl-dev libtool libusb-1.0-0 libusb-1.0-0-dev \
-libusb-dev lz4 lzma lzma-alone m4 nasm openssl p7zip p7zip-full parted pciutils \
+libusb-dev lz4 lzma lzma-alone m4 nasm openssl 7zip parted pciutils \
 perl pkg-config python3 python3-distutils-extra python3-pkg-resources python3-pycryptodome \
 python3-pyelftools python3-setuptools python-is-python3 sharutils swig unar \
 unifont unifont-bin unzip uuid-dev wget xfonts-unifont zlib1g-dev ccache \
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

-pkg_add="emerge --ask --verbose --quiet"
+pkg_add="emerge --ask --verbose --quiet --update"
 pkglist=" \
 sys-libs/ncurses dev-util/pkgconf sys-libs/libsepol app-arch/xz-utils \
 sys-devel/m4 app-arch/unzip dev-lang/swig app-cdr/cdrtools sys-devel/flex \
@@ -13,7 +13,7 @@ sys-block/parted sys-fs/mtools app-arch/lz4 dev-libs/leancrypto sys-fs/fuse \
 sys-apps/dtc net-libs/gnutls net-misc/curl dev-build/cmake dev-vcs/git \
 dev-util/ccache dev-embedded/libftdi app-arch/innoextract sys-devel/gcc \
 sys-apps/pciutils app-crypt/efitools gnustep-base/gnustep-make gnustep-base/gnustep-base \
-app-arch/unar app-arch/p7zip dev-lang/python dev-python/setuptools dev-python/ply \
+app-arch/unar app-arch/7zip dev-lang/python dev-python/setuptools dev-python/ply \
 sys-libs/libselinux dev-python/pyelftools dev-python/pycparser dev-python/cffi \
 dev-python/pycryptodome app-text/doxygen media-fonts/unifont media-libs/libsdl2 \
 sys-power/acpi_call sys-devel/crossdev \
@@ -6,7 +6,7 @@ cross-arm-none-eabi-libstdc++ cross-arm-none-eabi-newlib curl \
 dejavu-fonts-ttf device-mapper doxygen e2fsprogs flex font-unifont-bdf \
 freetype freetype-devel fuse gawk gcc-ada gdb gettext gettext-devel git \
 gnutls-devel help2man innoextract libftdi1 libpciaccess libusb libuuid-devel \
-nasm ncurses ncurses-devel openssl openssl-devel p7zip parted pciutils perl \
+nasm ncurses ncurses-devel openssl openssl-devel 7zip parted pciutils perl \
 perl-LWP python python3 python3-devel python3-setuptools rsync sharutils \
 subversion swig texinfo unar unzip wget xz zlib ccache \
 "
@@ -452,7 +452,7 @@ xbmk_set_mirror()
 xbmk_git_init()
 {
 	for gitarg in "user.name" "user.email"; do
-		if [ "$2" != "-b" ]; then
+		if [ "${2-}" != "-b" ]; then

 			# we only need git name/email set for building
 			# coreboot. this is a bit of a hack, but it should
@@ -501,10 +501,12 @@ xbmk_git_init()

 	x_ git init 1>/dev/null 2>/dev/null
 	x_ git add -A . 1>/dev/null 2>/dev/null
-	x_ git commit -m "$projectname $version" --date "$cdate" \
+	x_ git -c user.name="xbmk" -c user.email="xbmk@example.com" \
+	    commit -m "$projectname $version" --date "$cdate" \
 	    --author="xbmk <xbmk@example.com>" 1>/dev/null 2>/dev/null
-	x_ git tag -a "$version" -m "$projectname $version" 1>/dev/null \
-	    2>/dev/null; :
+	x_ git -c user.name="xbmk" -c user.email="xbmk@example.com" \
+	    tag -a "$version" -m "$projectname $version" \
+	    1>/dev/null 2>/dev/null; :
 }

 xbmk_child_exec()
Author	SHA1	Message	Date
Leah Rowe	72238d22b5	Merge pull request 'Make emerge ignore rebuilds' (#444 ) from folkmaster/lbmk:master into master Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/444	2026-07-28 03:26:10 +02:00
Leah Rowe	d64090d0b2	Merge pull request 'Fix Git identity handling in xbmk_git_init' (#445 ) from zoomm10/lbmk:fix-git-identity into master Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/445	2026-07-28 03:23:41 +02:00
Zoomm Deka	ab13b80250	fix git identity handling in xbmk_git_init Signed-off-by: Zoomm Deka <zoomm10@gmail.com>	2026-07-28 03:02:02 +02:00
folkmaster	33f6364e26	switch from p7zip to 7zip cause p7zip is obselete	2026-07-25 01:36:59 +02:00
folkmaster	6ef180228d	switch from p7zip to 7zip cause p7zip is obselete	2026-07-25 01:35:53 +02:00
folkmaster	b61677c9dd	Nope fedora does not provide an official 7zip package for older builds of fedora	2026-07-25 01:33:47 +02:00
folkmaster	ee597d5815	switch from p7zip to 7zip cause p7zip is obselete	2026-07-25 01:31:45 +02:00
folkmaster	94afbab44e	switch from p7zip to 7zip cause p7zip is obselete	2026-07-25 01:28:34 +02:00
folkmaster	ba9a1fe130	switch from p7zip to 7zip cause p7zip is obselete	2026-07-25 01:25:15 +02:00
folkmaster	52672c135d	Remove the oneshot flag cause that is a bad idea	2026-07-25 01:04:54 +02:00
folkmaster	3fb48e3818	Make it ignore rebuilds	2026-07-23 23:38:15 +02:00