From 99018af3bd45bce836bff4c67a928bdeb23d635c Mon Sep 17 00:00:00 2001 From: emmett1 Date: Thu, 10 Oct 2019 17:43:15 +0800 Subject: [PATCH] updated --- 02-base | 2 +- .../pkgutils_fix-build-needed-trigger.patch | 17 ++ ports/efibootmgr/Pkgfile | 16 ++ ...6d78a7fb5f6c5fb4a1d646040539db6cf865.patch | 51 ++++++ ports/efivar/Pkgfile | 23 +++ ...a8921010d03f46704a476c69861515deb1ca.patch | 56 ++++++ ...53db85ff10890209d0fe48fb4856ad68e4e0.patch | 168 ++++++++++++++++++ ports/lz4/Pkgfile | 15 ++ ports/lzo/Pkgfile | 18 ++ ports/pciutils/Pkgfile | 28 +++ ports/pkgutils/Pkgfile | 3 +- .../pkgutils_fix-build-needed-trigger.patch | 17 ++ ports/popt/Pkgfile | 17 ++ ports/squashfs-tools/Pkgfile | 16 ++ toolchain/42-pkgutils | 1 + 15 files changed, 446 insertions(+), 2 deletions(-) create mode 100644 patches/pkgutils_fix-build-needed-trigger.patch create mode 100755 ports/efibootmgr/Pkgfile create mode 100644 ports/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch create mode 100755 ports/efivar/Pkgfile create mode 100644 ports/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch create mode 100644 ports/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch create mode 100755 ports/lz4/Pkgfile create mode 100755 ports/lzo/Pkgfile create mode 100755 ports/pciutils/Pkgfile create mode 100644 ports/pkgutils/pkgutils_fix-build-needed-trigger.patch create mode 100755 ports/popt/Pkgfile create mode 100755 ports/squashfs-tools/Pkgfile diff --git a/02-base b/02-base index 7e71d2a..5fee4ce 100755 --- a/02-base +++ b/02-base @@ -141,7 +141,7 @@ PKGS="filesystem linux-api-headers man-pages glibc tzdata zlib file readline m4 perl perl-xml-parser intltool autoconf automake xz kmod gettext elfutils libffi openssl python3 coreutils diffutils gawk findutils groff fuse2 grub less gzip iproute2 kbd libpipeline make patch man-db tar texinfo vim procps-ng util-linux e2fsprogs sysklogd sysvinit eudev lfs-bootscripts linux-firmware libarchive mkinitramfs linux libtasn1 p11-kit ca-certificates - wget pkgutils libnl dbus libxml2 dhcpcd wpa_supplicant" + wget pkgutils libnl dbus libxml2 dhcpcd wpa_supplicant lzo lz4 squashfs-tools popt efivar pciutils efibootmgr" if [ ! -f $LFS/var/lib/pkg/db ]; then lfs_dirs diff --git a/patches/pkgutils_fix-build-needed-trigger.patch b/patches/pkgutils_fix-build-needed-trigger.patch new file mode 100644 index 0000000..4073fb6 --- /dev/null +++ b/patches/pkgutils_fix-build-needed-trigger.patch @@ -0,0 +1,17 @@ +diff -Naur pkgutils-5.40.7-ori/pkgmk.in pkgutils-5.40.7/pkgmk.in +--- pkgutils-5.40.7-ori/pkgmk.in 2018-02-15 00:17:57.000000000 +0800 ++++ pkgutils-5.40.7/pkgmk.in 2019-10-10 16:10:02.519999503 +0800 +@@ -654,13 +654,6 @@ + RESULT="yes" + if [ -f $TARGET ]; then + RESULT="no" +- for FILE in $PKGMK_PKGFILE ${source[@]}; do +- FILE=`get_filename $FILE` +- if [ -e $FILE ] && [ ! $TARGET -nt $FILE ]; then +- RESULT="yes" +- break +- fi +- done + fi + + echo $RESULT diff --git a/ports/efibootmgr/Pkgfile b/ports/efibootmgr/Pkgfile new file mode 100755 index 0000000..00efaf8 --- /dev/null +++ b/ports/efibootmgr/Pkgfile @@ -0,0 +1,16 @@ +# Description: Manipulate efi boot managers +# URL: +# Maintainer: +# Depends on: efivar pciutils + +name=efibootmgr +version=16 +release=1 +source=(https://github.com/rhboot/efibootmgr/releases/download/$version/efibootmgr-$version.tar.bz2) + +build() { + cd $name-$version + EFIDIR=/boot/efi make + install -D src/efibootmgr $PKG/usr/sbin/efibootmgr + install -D src/efibootmgr.8 $PKG/usr/share/man/man8/efibootmgr.8 +} diff --git a/ports/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch b/ports/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch new file mode 100644 index 0000000..e4a4358 --- /dev/null +++ b/ports/efivar/0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch @@ -0,0 +1,51 @@ +From 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865 Mon Sep 17 00:00:00 2001 +From: Chih-Wei Huang +Date: Tue, 26 Feb 2019 18:42:20 +0800 +Subject: [PATCH] Fix another error of -Werror=address-of-packed-member + +Android 9 clang complains: + +external/efivar/src/dp-message.c:367:24: error: taking address of packed member '' of class or structure 'efidp_infiniband' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member] + (efi_guid_t *)&dp->infiniband.ioc_guid); + ^~~~~~~~~~~~~~~~~~~~~~~ +external/efivar/src/dp.h:76:19: note: expanded from macro 'format_guid' + memmove(&_guid, guid, sizeof(_guid)); \ + ^~~~ +1 error generated. + +Since commit c3c553d the fifth parameter of format_guid() is treated as +a const void *. The casting is unnecessary. + +Signed-off-by: Chih-Wei Huang +--- + src/dp-media.c | 3 +-- + src/dp-message.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/dp-media.c b/src/dp-media.c +index 96a576f..be691c4 100644 +--- a/src/dp-media.c ++++ b/src/dp-media.c +@@ -46,8 +46,7 @@ _format_media_dn(char *buf, size_t size, const_efidp dp) + break; + case EFIDP_HD_SIGNATURE_GUID: + format(buf, size, off, "HD", "GPT,"); +- format_guid(buf, size, off, "HD", +- (efi_guid_t *)dp->hd.signature); ++ format_guid(buf, size, off, "HD", dp->hd.signature); + format(buf, size, off, "HD", + ",0x%"PRIx64",0x%"PRIx64")", + dp->hd.start, dp->hd.size); +diff --git a/src/dp-message.c b/src/dp-message.c +index 9f96466..6b8e907 100644 +--- a/src/dp-message.c ++++ b/src/dp-message.c +@@ -364,7 +364,7 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) + dp->infiniband.port_gid[1], + dp->infiniband.port_gid[0]); + format_guid(buf, size, off, "Infiniband", +- (efi_guid_t *)&dp->infiniband.ioc_guid); ++ &dp->infiniband.ioc_guid); + format(buf, size, off, "Infiniband", + ",%"PRIu64",%"PRIu64")", + dp->infiniband.target_port_id, diff --git a/ports/efivar/Pkgfile b/ports/efivar/Pkgfile new file mode 100755 index 0000000..b4ca2dc --- /dev/null +++ b/ports/efivar/Pkgfile @@ -0,0 +1,23 @@ +# Description: Tools and library to manipulate EFI variables +# URL: +# Maintainer: +# Depends on: popt + +name=efivar +version=37 +release=1 +source=(https://github.com/rhboot/efivar/releases/download/$version/$name-$version.tar.bz2 + 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch + b98ba8921010d03f46704a476c69861515deb1ca.patch + c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch) + +build() { + cd $name-$version + + # thanks to ataraxia for the patch + patch -Np1 -i ../0dad6d78a7fb5f6c5fb4a1d646040539db6cf865.patch + patch -Np1 -i ../b98ba8921010d03f46704a476c69861515deb1ca.patch + patch -Np1 -i ../c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch + make -j1 + make libdir=/usr/lib DESTDIR=$PKG install +} diff --git a/ports/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch b/ports/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch new file mode 100644 index 0000000..f40942f --- /dev/null +++ b/ports/efivar/b98ba8921010d03f46704a476c69861515deb1ca.patch @@ -0,0 +1,56 @@ +From b98ba8921010d03f46704a476c69861515deb1ca Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Mon, 7 Jan 2019 10:30:59 -0500 +Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers + safely. + +GCC 9 adds -Werror=address-of-packed-member, which causes us to see the +build error reported at + https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 . + +That bug report shows us the following: + +In file included from dp.c:26: +dp.h: In function 'format_vendor_helper': +dp.h:120:37: error: taking address of packed member of 'struct ' may result in an unaligned pointer value [-Werror=address-of-packed-member] + 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ +dp.h:74:25: note: in definition of macro 'format_guid' + 74 | _rc = efi_guid_to_str(guid, &_guidstr); \ + | ^~~~ +cc1: all warnings being treated as errors + +This patch makes format_guid() use a local variable as a bounce buffer +in the case that the guid we're passed is aligned as chaotic neutral. + +Note that this only fixes this instance and there may be others that bz +didn't show because it exited too soon, and I don't have a gcc 9 build +in front of me right now. + +Signed-off-by: Peter Jones +--- + src/dp.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/dp.h b/src/dp.h +index aa4e390..20cb608 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -70,8 +70,15 @@ + #define format_guid(buf, size, off, dp_type, guid) ({ \ + int _rc; \ + char *_guidstr = NULL; \ +- \ +- _rc = efi_guid_to_str(guid, &_guidstr); \ ++ efi_guid_t _guid; \ ++ const efi_guid_t * const _guid_p = \ ++ likely(__alignof__(guid) == sizeof(guid)) \ ++ ? guid \ ++ : &_guid; \ ++ \ ++ if (unlikely(__alignof__(guid) == sizeof(guid))) \ ++ memmove(&_guid, guid, sizeof(_guid)); \ ++ _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ + dp_type); \ diff --git a/ports/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch b/ports/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch new file mode 100644 index 0000000..bbb6a99 --- /dev/null +++ b/ports/efivar/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch @@ -0,0 +1,168 @@ +From c3c553db85ff10890209d0fe48fb4856ad68e4e0 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 21 Feb 2019 15:20:12 -0500 +Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches. + +This gets rid of all the places GCC 9's -Werror=address-of-packed-member +flags as problematic. + +Fixes github issue #123 + +Signed-off-by: Peter Jones +--- + src/dp-message.c | 6 ++++-- + src/dp.h | 12 ++++-------- + src/guid.c | 2 +- + src/include/efivar/efivar.h | 2 +- + src/ucs2.h | 27 +++++++++++++++++++-------- + 5 files changed, 29 insertions(+), 20 deletions(-) + +diff --git a/src/dp-message.c b/src/dp-message.c +index 3724e5f..9f96466 100644 +--- a/src/dp-message.c ++++ b/src/dp-message.c +@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) + ) / sizeof(efi_ip_addr_t); + format(buf, size, off, "Dns", "Dns("); + for (int i=0; i < end; i++) { +- const efi_ip_addr_t *addr = &dp->dns.addrs[i]; ++ efi_ip_addr_t addr; ++ ++ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr)); + if (i != 0) + format(buf, size, off, "Dns", ","); + format_ip_addr(buf, size, off, "Dns", +- dp->dns.is_ipv6, addr); ++ dp->dns.is_ipv6, &addr); + } + format(buf, size, off, "Dns", ")"); + break; +diff --git a/src/dp.h b/src/dp.h +index 20cb608..1f921d5 100644 +--- a/src/dp.h ++++ b/src/dp.h +@@ -71,13 +71,9 @@ + int _rc; \ + char *_guidstr = NULL; \ + efi_guid_t _guid; \ +- const efi_guid_t * const _guid_p = \ +- likely(__alignof__(guid) == sizeof(guid)) \ +- ? guid \ +- : &_guid; \ +- \ +- if (unlikely(__alignof__(guid) == sizeof(guid))) \ +- memmove(&_guid, guid, sizeof(_guid)); \ ++ const efi_guid_t * const _guid_p = &_guid; \ ++ \ ++ memmove(&_guid, guid, sizeof(_guid)); \ + _rc = efi_guid_to_str(_guid_p, &_guidstr); \ + if (_rc < 0) { \ + efi_error("could not build %s GUID DP string", \ +@@ -86,7 +82,7 @@ + _guidstr = onstack(_guidstr, \ + strlen(_guidstr)+1); \ + _rc = format(buf, size, off, dp_type, "%s", \ +- _guidstr); \ ++ _guidstr); \ + } \ + _rc; \ + }) +diff --git a/src/guid.c b/src/guid.c +index 306c9ff..3156b3b 100644 +--- a/src/guid.c ++++ b/src/guid.c +@@ -31,7 +31,7 @@ + extern const efi_guid_t efi_guid_zero; + + int NONNULL(1, 2) PUBLIC +-efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b) ++efi_guid_cmp(const void * const a, const void * const b) + { + return memcmp(a, b, sizeof (efi_guid_t)); + } +diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h +index 316891c..ad6449d 100644 +--- a/src/include/efivar/efivar.h ++++ b/src/include/efivar/efivar.h +@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid) + + extern int efi_guid_is_zero(const efi_guid_t *guid); + extern int efi_guid_is_empty(const efi_guid_t *guid); +-extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b); ++extern int efi_guid_cmp(const void * const a, const void * const b); + + /* import / export functions */ + typedef struct efi_variable efi_variable_t; +diff --git a/src/ucs2.h b/src/ucs2.h +index dbb5900..edd8367 100644 +--- a/src/ucs2.h ++++ b/src/ucs2.h +@@ -23,16 +23,21 @@ + (((val) & ((mask) << (shift))) >> (shift)) + + static inline size_t UNUSED +-ucs2len(const uint16_t * const s, ssize_t limit) ++ucs2len(const void *vs, ssize_t limit) + { + ssize_t i; +- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++) ++ const uint16_t *s = vs; ++ const uint8_t *s8 = vs; ++ ++ for (i = 0; ++ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; ++ i++, s8 += 2, s++) + ; + return i; + } + + static inline size_t UNUSED +-ucs2size(const uint16_t * const s, ssize_t limit) ++ucs2size(const void *s, ssize_t limit) + { + size_t rc = ucs2len(s, limit); + rc *= sizeof (uint16_t); +@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit) + } + + static inline unsigned char * UNUSED +-ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) ++ucs2_to_utf8(const void * const voidchars, ssize_t limit) + { + ssize_t i, j; + unsigned char *ret; ++ const uint16_t * const chars = voidchars; + + if (limit < 0) + limit = ucs2len(chars, -1); +@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) + } + + static inline ssize_t UNUSED NONNULL(4) +-utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) ++utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8) + { + ssize_t req; + ssize_t i, j; ++ uint16_t *ucs2 = ucs2void; ++ uint16_t val16; + + if (!ucs2 && size > 0) { + errno = EINVAL; +@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) + val = utf8[i] & 0x7f; + i += 1; + } +- ucs2[j] = val; ++ val16 = val; ++ ucs2[j] = val16; ++ } ++ if (terminate) { ++ val16 = 0; ++ ucs2[j++] = val16; + } +- if (terminate) +- ucs2[j++] = (uint16_t)0; + return j; + }; + diff --git a/ports/lz4/Pkgfile b/ports/lz4/Pkgfile new file mode 100755 index 0000000..01b5260 --- /dev/null +++ b/ports/lz4/Pkgfile @@ -0,0 +1,15 @@ +# Description: Extremely fast compression algorithm +# URL: +# Maintainer: +# Depends on: + +name=lz4 +version=1.9.2 +release=1 +source=(https://github.com/lz4/lz4/archive/v$version/lz4-v$version.tar.gz) + +build() { + cd $name-$version + make PREFIX=/usr + make DESTDIR=$PKG PREFIX=/usr install +} diff --git a/ports/lzo/Pkgfile b/ports/lzo/Pkgfile new file mode 100755 index 0000000..0eb014d --- /dev/null +++ b/ports/lzo/Pkgfile @@ -0,0 +1,18 @@ +# Description: Data compression library +# URL: +# Maintainer: +# Depends on: + +name=lzo +version=2.10 +release=1 +source=(https://www.oberhumer.com/opensource/lzo/download/lzo-$version.tar.gz) + +build() { + cd $name-$version + ./configure --prefix=/usr \ + --enable-shared \ + --disable-static + make + make DESTDIR=$PKG install +} diff --git a/ports/pciutils/Pkgfile b/ports/pciutils/Pkgfile new file mode 100755 index 0000000..4d60ee2 --- /dev/null +++ b/ports/pciutils/Pkgfile @@ -0,0 +1,28 @@ +# Description: Set of programs for listing PCI devices, inspecting their status and setting their configuration registers +# URL: https://mj.ucw.cz/sw/pciutils/ +# Maintainer: +# Depends on: + +name=pciutils +version=3.6.2 +release=1 +source=(https://www.kernel.org/pub/software/utils/$name/$name-$version.tar.xz) + +build() { + cd $name-$version + + make OPT="${CFLAGS} -fPIC -DPIC" \ + PREFIX=/usr \ + SHAREDIR=/usr/share/hwdata \ + MANDIR=/usr/share/man \ + SHARED=yes + + make PREFIX=/usr \ + SHAREDIR=/usr/share/hwdata \ + MANDIR=/usr/share/man \ + SHARED=yes \ + DESTDIR=$PKG \ + install install-lib + + chmod -v 755 $PKG/usr/lib/libpci.so +} diff --git a/ports/pkgutils/Pkgfile b/ports/pkgutils/Pkgfile index 92f1114..10dfc02 100755 --- a/ports/pkgutils/Pkgfile +++ b/ports/pkgutils/Pkgfile @@ -10,7 +10,8 @@ source=(http://crux.nu/files/$name-$version.tar.xz pkgmk.conf pkgutils_ignore-conflict.patch pkgutils_remove-libtool.patch - pkgutils_add-compress-infopages.patch) + pkgutils_add-compress-infopages.patch + pkgutils_fix-build-needed-trigger.patch) build () { cd $name-$version diff --git a/ports/pkgutils/pkgutils_fix-build-needed-trigger.patch b/ports/pkgutils/pkgutils_fix-build-needed-trigger.patch new file mode 100644 index 0000000..4073fb6 --- /dev/null +++ b/ports/pkgutils/pkgutils_fix-build-needed-trigger.patch @@ -0,0 +1,17 @@ +diff -Naur pkgutils-5.40.7-ori/pkgmk.in pkgutils-5.40.7/pkgmk.in +--- pkgutils-5.40.7-ori/pkgmk.in 2018-02-15 00:17:57.000000000 +0800 ++++ pkgutils-5.40.7/pkgmk.in 2019-10-10 16:10:02.519999503 +0800 +@@ -654,13 +654,6 @@ + RESULT="yes" + if [ -f $TARGET ]; then + RESULT="no" +- for FILE in $PKGMK_PKGFILE ${source[@]}; do +- FILE=`get_filename $FILE` +- if [ -e $FILE ] && [ ! $TARGET -nt $FILE ]; then +- RESULT="yes" +- break +- fi +- done + fi + + echo $RESULT diff --git a/ports/popt/Pkgfile b/ports/popt/Pkgfile new file mode 100755 index 0000000..cc011c5 --- /dev/null +++ b/ports/popt/Pkgfile @@ -0,0 +1,17 @@ +# Description: Popt libraries which are used by some programs to parse command-line options +# URL: +# Maintainer: +# Depends on: + +name=popt +version=1.16 +release=1 +source=(http://ftp.rpm.org/mirror/$name/$name-$version.tar.gz) + +build() { + cd $name-$version + + ./configure --prefix=/usr --disable-static + make + make DESTDIR=$PKG install +} diff --git a/ports/squashfs-tools/Pkgfile b/ports/squashfs-tools/Pkgfile new file mode 100755 index 0000000..ae166cb --- /dev/null +++ b/ports/squashfs-tools/Pkgfile @@ -0,0 +1,16 @@ +# Description: Tools for squashfs, a highly compressed read-only filesystem for Linux +# URL: +# Maintainer: +# Depends on: zlib lzo xz lz4 + +name=squashfs-tools +version=4.4 +release=1 +source=(https://downloads.sourceforge.net/squashfs/squashfs$version.tar.gz) + +build() { + cd squashfs${version}/${name} + make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1 + install -Dm755 mksquashfs "$PKG"/usr/bin/mksquashfs + install -m755 unsquashfs "$PKG"/usr/bin/unsquashfs +} diff --git a/toolchain/42-pkgutils b/toolchain/42-pkgutils index 24047a4..e0a24c4 100755 --- a/toolchain/42-pkgutils +++ b/toolchain/42-pkgutils @@ -8,6 +8,7 @@ build() { patch -Np1 -i $PATCHDIR/pkgutils_ignore-conflict.patch patch -Np1 -i $PATCHDIR/pkgutils_remove-libtool.patch patch -Np1 -i $PATCHDIR/pkgutils_add-compress-infopages.patch + patch -Np1 -i $PATCHDIR/pkgutils_fix-build-needed-trigger.patch make BINDIR=/tools/bin MANDIR=/tools/man ETCDIR=/tools/etc install sed -i 's,/etc/pkgmk.conf,/tools/etc/pkgmk.conf,' /tools/bin/pkgmk