diff options
| -rw-r--r-- | config/dependencies/arch | 2 | ||||
| -rw-r--r-- | config/dependencies/debian | 2 | ||||
| -rw-r--r-- | config/dependencies/gentoo | 4 | ||||
| -rw-r--r-- | config/dependencies/void | 2 | ||||
| -rw-r--r-- | include/init.sh | 25 |
5 files changed, 26 insertions, 9 deletions
diff --git a/config/dependencies/arch b/config/dependencies/arch index 79819bda..564d6187 100644 --- a/config/dependencies/arch +++ b/config/dependencies/arch @@ -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 \ " diff --git a/config/dependencies/debian b/config/dependencies/debian index 170bf21c..0de611b4 100644 --- a/config/dependencies/debian +++ b/config/dependencies/debian @@ -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 \ diff --git a/config/dependencies/gentoo b/config/dependencies/gentoo index ab0237b7..2a9b2543 100644 --- a/config/dependencies/gentoo +++ b/config/dependencies/gentoo @@ -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 \ diff --git a/config/dependencies/void b/config/dependencies/void index fdb270a8..4165889c 100644 --- a/config/dependencies/void +++ b/config/dependencies/void @@ -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 \ " diff --git a/include/init.sh b/include/init.sh index f8f0f910..5675f035 100644 --- a/include/init.sh +++ b/include/init.sh @@ -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 @@ -461,6 +461,21 @@ xbmk_git_init() break fi + if [ $# -gt 2 ] && [ "$3" != "coreboot" ]; then + + # we still might run -b sometimes, for e.g. + # dependencies of ./mk inject. if -b is used + # but it's not for coreboot, don't check. + + # coreboot is a multi-tree project, so the third + # argument will always be coreboot, when building + # with -b. + + # we only need the git name/email check when + # doing ./mk -b coreboot + + break + fi gitcmd="git config --includes $gitarg" if ! $gitcmd 1>/dev/null 2>/dev/null; then err "Run this first: $gitcmd \"your ${gitcmd##*.}\"" \ @@ -486,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() |