iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30 from tiopex/master

Browse Source 
Disable locale, downgrade parted to v3.1, use fatresize v1.1.0
This commit is contained in:
tiopex
2023-04-12 07:13:28 +02:00
committed by GitHub
parent f75216531a dc6778c814
commit 7059eb0167
7 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
board/miyoo/boot/firstboot
View File

@@ -61,7 +61,7 @@ if test -e "${MOUNTDIR}/resize"; then
echo "This can take A LONG TIME, so be patient." | tee -a ${LOG}
umount /dev/mmcblk0p4 | tee -a ${LOG}
fsck.fat -y /dev/mmcblk0p4 | tee -a ${LOG}
fatresize_hc | tee -a ${LOG}
fatresize -s max -v -p /dev/mmcblk0p4 -n 4
fsck.fat -y /dev/mmcblk0p4 | tee -a ${LOG}
echo -n -e \\xEB\\x58\\x90 > /dev/mmcblk0p4
sync
@@ -75,7 +75,7 @@ mount -o remount,rw "${MOUNTDIR}" | tee -a ${LOG}
# disable this script
echo "Disabling the firstboot script." | tee -a ${LOG}
mv "${MOUNTDIR}/firstboot" "${MOUNTDIR}/firstboot.done" | tee -a ${LOG}
if test -e "${MOUNTDIR}/resize"; then rm "${MOUNTDIR}/resize"; fi
if test -e "${MOUNTDIR}/resize"; then rm "${MOUNTDIR}/resize"; reboot; fi
mount -o remount,ro "${MOUNTDIR}" | tee -a ${LOG}
echo

2
configs/miyoo_uclibc_defconfig
View File

@@ -6,7 +6,7 @@ BR2_PER_PACKAGE_DIRECTORIES=y
BR2_RELRO_NONE=y
BR2_TOOLCHAIN_BUILDROOT_VENDOR="miyoo"
BR2_KERNEL_HEADERS_4_9=y
BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_PTHREAD_DEBUG=y
BR2_GCC_VERSION_9_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y

15
package/fatresize/fatresize.mk
View File

@@ -1,14 +1,5 @@
FATRESIZE_VERSION = origin/hardcoded
FATRESIZE_VERSION = v1.1.0
FATRESIZE_SITE_METHOD = git
FATRESIZE_SITE = https://github.com/flabbergast/fatresize.git
FATRESIZE_SITE = https://github.com/ya-mouse/fatresize.git
FATRESIZE_DEPENDENCIES = parted
define FATRESIZE_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" -C $(@D)
endef
define FATRESIZE_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/fatresize_hc $(TARGET_DIR)/usr/bin
endef
$(eval $(generic-package))
$(eval $(autotools-package))

5
package/parted/Config.in
View File

@@ -1,6 +1,5 @@
config BR2_PACKAGE_PARTED
bool "parted"
depends on BR2_ENABLE_LOCALE
depends on BR2_USE_WCHAR
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -9,5 +8,5 @@ config BR2_PACKAGE_PARTED
http://www.gnu.org/software/parted/
comment "parted needs a toolchain w/ locale, wchar"
depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR
comment "parted needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR

24
package/parted/parted-3.1.patch Normal file
View File

@@ -0,0 +1,24 @@
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index e2c4139..56ae782 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -41,6 +41,7 @@
#include <sys/utsname.h> /* for uname() */
#include <scsi/scsi.h>
#include <assert.h>
+#include <sys/sysmacros.h>
#ifdef ENABLE_DEVICE_MAPPER
#include <libdevmapper.h>
#endif
diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h
index 2b55752..a6ec8fb 100644
--- a/libparted/fs/xfs/platform_defs.h
+++ b/libparted/fs/xfs/platform_defs.h
@@ -38,6 +38,7 @@
#include <stdarg.h>
#include <assert.h>
#include <endian.h>
+#include <fcntl.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>

1
package/parted/parted.hash
View File

@@ -1,5 +1,6 @@
# Locally calculated after checking pgp signature
sha256 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 parted-3.3.tar.xz
sha256 5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 parted-3.1.tar.xz
# Locally calculated
sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING

2
package/parted/parted.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
PARTED_VERSION = 3.3
PARTED_VERSION = 3.1
PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
PARTED_SITE = $(BR2_GNU_MIRROR)/parted
PARTED_DEPENDENCIES = host-pkgconf util-linux