Skip to content

Commit

Permalink
Update buildroot to version 2021.02.8 - push gptfdisk to 1.0.8 and re…
Browse files Browse the repository at this point in the history
…move ntfs-3g patch witch is now included in the official code
  • Loading branch information
Sebastian-Roth committed Dec 16, 2021
1 parent 9aff261 commit 9735f18
Show file tree
Hide file tree
Showing 8 changed files with 847 additions and 816 deletions.
@@ -0,0 +1,42 @@
From 22e69d77d745b42ca85fefdf8c9f7625b852b964 Mon Sep 17 00:00:00 2001
From: Pierre-Jean Texier <pjtexier@koncepto.io>
Date: Wed, 26 Feb 2020 22:08:28 +0100
Subject: [PATCH] gptcurses: partially revert "Tweaks for building on the
latest XCode for macOS"

This partially reverts commit bbd6b4cc67ffcdf7b2a6bd5008d28006cb147393.

Fixes:

| gptcurses.cc:29:10: fatal error: ncursesw/ncurses.h: No such file or directory
| 29 | #include <ncursesw/ncurses.h>
| | ^~~~~~~~~~~~~~~~~~~~

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
[Retrieved from:
https://sourceforge.net/u/texierp/gptfdisk/ci/22e69d77d745b42ca85fefdf8c9f7625b852b964
Upstream status (with meson build system):
https://sourceforge.net/p/gptfdisk/code/merge-requests/21]
---
gptcurses.cc | 4 ----
1 file changed, 4 deletions(-)

diff --git a/gptcurses.cc b/gptcurses.cc
index 1b18cf2..4ebfde1 100644
--- a/gptcurses.cc
+++ b/gptcurses.cc
@@ -23,11 +23,7 @@
#include <iostream>
#include <string>
#include <sstream>
-#if defined (__APPLE__) || (__FreeBSD__)
#include <ncurses.h>
-#else
-#include <ncursesw/ncurses.h>
-#endif
#include "gptcurses.h"
#include "support.h"

--
2.26.2

9 changes: 4 additions & 5 deletions Buildroot/package/gptfdisk/gptfdisk.hash
@@ -1,6 +1,5 @@
# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.4/
md5 5ecc3c44913bb6b53d3708d1ac7ac295 gptfdisk-1.0.4.tar.gz
sha1 4c2d60bedd4eac1014727e3b126de96966205410 gptfdisk-1.0.4.tar.gz
# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.8/
sha1 c8824e779056158fa32887e415f5399a8646c3c5 gptfdisk-1.0.8.tar.gz
# Locally computed
sha256 b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d gptfdisk-1.0.4.tar.gz
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
sha256 95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df gptfdisk-1.0.8.tar.gz
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
2 changes: 1 addition & 1 deletion Buildroot/package/gptfdisk/gptfdisk.mk
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

GPTFDISK_VERSION = 1.0.4
GPTFDISK_VERSION = 1.0.8
GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
GPTFDISK_LICENSE = GPL-2.0+
GPTFDISK_LICENSE_FILES = COPYING
Expand Down
203 changes: 0 additions & 203 deletions Buildroot/package/ntfs-3g/ntfs-mft-fixes.patch

This file was deleted.

2 changes: 1 addition & 1 deletion build.sh
@@ -1,7 +1,7 @@
#!/bin/bash

[[ -z $KERNEL_VERSION ]] && KERNEL_VERSION='5.10.76'
[[ -z $BUILDROOT_VERSION ]] && BUILDROOT_VERSION='2020.02.12'
[[ -z $BUILDROOT_VERSION ]] && BUILDROOT_VERSION='2021.02.8'

Usage() {
echo -e "Usage: $0 [-knfvh?] [-a x64]"
Expand Down

0 comments on commit 9735f18

Please sign in to comment.