Skip to content

Commit c61d125

Browse files
committed
switch to btrfs
1 parent 2d1db57 commit c61d125

File tree

4 files changed

+147
-102
lines changed

4 files changed

+147
-102
lines changed

config/buildroot

Lines changed: 104 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ BR2_STRIP_EXCLUDE_DIRS=""
103103
# BR2_OPTIMIZE_2 is not set
104104
# BR2_OPTIMIZE_3 is not set
105105
BR2_OPTIMIZE_S=y
106-
# BR2_ENABLE_SSP is not set
106+
107+
#
108+
# enabling Stack Smashing Protection requires support in the toolchain
109+
#
107110
# BR2_STATIC_LIBS is not set
108111
BR2_SHARED_LIBS=y
109112
# BR2_SHARED_STATIC_LIBS is not set
@@ -119,7 +122,7 @@ BR2_GLOBAL_PATCH_DIR=""
119122
# Toolchain
120123
#
121124
BR2_TOOLCHAIN=y
122-
BR2_TOOLCHAIN_USES_GLIBC=y
125+
BR2_TOOLCHAIN_USES_UCLIBC=y
123126
BR2_TOOLCHAIN_BUILDROOT=y
124127
# BR2_TOOLCHAIN_EXTERNAL is not set
125128
BR2_TOOLCHAIN_BUILDROOT_VENDOR="buildroot"
@@ -138,14 +141,32 @@ BR2_TOOLCHAIN_BUILDROOT_VENDOR="buildroot"
138141
BR2_KERNEL_HEADERS_4_3=y
139142
# BR2_KERNEL_HEADERS_VERSION is not set
140143
BR2_DEFAULT_KERNEL_HEADERS="4.3"
141-
# BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
142-
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
144+
BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
145+
# BR2_TOOLCHAIN_BUILDROOT_GLIBC is not set
143146
# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set
144-
BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
145-
BR2_PACKAGE_GLIBC=y
146-
# BR2_GLIBC_VERSION_2_21 is not set
147-
BR2_GLIBC_VERSION_2_22=y
148-
BR2_GLIBC_VERSION_STRING="2.22"
147+
BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
148+
BR2_PACKAGE_UCLIBC=y
149+
150+
#
151+
# uClibc Options
152+
#
153+
BR2_UCLIBC_VERSION_SUPPORTS_NPTL=y
154+
# BR2_UCLIBC_VERSION_0_9_33 is not set
155+
BR2_UCLIBC_VERSION_NG=y
156+
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
157+
BR2_UCLIBC_VERSION_STRING="1.0.9"
158+
BR2_UCLIBC_CONFIG="package/uclibc/uClibc-ng.config"
159+
BR2_UCLIBC_CONFIG_FRAGMENT_FILES=""
160+
# BR2_TOOLCHAIN_BUILDROOT_INET_RPC is not set
161+
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
162+
# BR2_TOOLCHAIN_BUILDROOT_LOCALE is not set
163+
# BR2_PTHREADS_NONE is not set
164+
BR2_PTHREADS_NATIVE=y
165+
# BR2_PTHREAD_DEBUG is not set
166+
# BR2_TOOLCHAIN_BUILDROOT_USE_SSP is not set
167+
# BR2_UCLIBC_INSTALL_UTILS is not set
168+
# BR2_UCLIBC_INSTALL_TEST_SUITE is not set
169+
BR2_UCLIBC_TARGET_ARCH="x86_64"
149170

150171
#
151172
# Binutils Options
@@ -175,17 +196,12 @@ BR2_GCC_ENABLE_TLS=y
175196
# BR2_GCC_ENABLE_OPENMP is not set
176197
# BR2_GCC_ENABLE_GRAPHITE is not set
177198
# BR2_PACKAGE_HOST_GDB is not set
178-
BR2_TOOLCHAIN_HAS_NATIVE_RPC=y
179199
BR2_USE_WCHAR=y
180-
BR2_ENABLE_LOCALE=y
181200
BR2_TOOLCHAIN_HAS_THREADS=y
182-
BR2_TOOLCHAIN_HAS_THREADS_DEBUG=y
183201
BR2_TOOLCHAIN_HAS_THREADS_NPTL=y
184202
BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS=y
185-
BR2_TOOLCHAIN_HAS_SSP=y
186203
# BR2_ENABLE_LOCALE_PURGE is not set
187-
BR2_GENERATE_LOCALE=""
188-
# BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY is not set
204+
BR2_NEEDS_GETTEXT=y
189205
BR2_USE_MMU=y
190206
BR2_TARGET_OPTIMIZATION="-pipe"
191207
BR2_TARGET_LDFLAGS=""
@@ -236,7 +252,10 @@ BR2_TARGET_GENERIC_PASSWD_SHA512=y
236252
BR2_TARGET_GENERIC_PASSWD_METHOD="sha-512"
237253
BR2_INIT_BUSYBOX=y
238254
# BR2_INIT_SYSV is not set
239-
# BR2_INIT_SYSTEMD is not set
255+
256+
#
257+
# systemd needs (e)glibc toolchain, headers >= 3.10
258+
#
240259
# BR2_INIT_NONE is not set
241260
# BR2_ROOTFS_DEVICE_CREATION_STATIC is not set
242261
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
@@ -279,13 +298,14 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT=""
279298
#
280299
BR2_LINUX_KERNEL=y
281300
# BR2_LINUX_KERNEL_LATEST_VERSION is not set
282-
BR2_LINUX_KERNEL_SAME_AS_HEADERS=y
283-
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
301+
# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
302+
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
284303
# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
285304
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
286305
# BR2_LINUX_KERNEL_CUSTOM_HG is not set
287306
# BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set
288-
BR2_LINUX_KERNEL_VERSION="4.3"
307+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.3.3"
308+
BR2_LINUX_KERNEL_VERSION="4.3.3"
289309
BR2_LINUX_KERNEL_PATCH=""
290310
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
291311
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
@@ -422,7 +442,10 @@ BR2_PACKAGE_XZ=y
422442
#
423443
# Debugging, profiling and benchmark
424444
#
425-
# BR2_PACKAGE_BLKTRACE is not set
445+
446+
#
447+
# blktrace needs a (e)glibc or musl toolchain
448+
#
426449

427450
#
428451
# bonnie++ needs a toolchain w/ C++
@@ -437,7 +460,10 @@ BR2_PACKAGE_XZ=y
437460
# duma needs a toolchain w/ C++, threads, dynamic library
438461
#
439462
# BR2_PACKAGE_FIO is not set
440-
# BR2_PACKAGE_GDB is not set
463+
464+
#
465+
# gdb/gdbserver needs a toolchain w/ threads, threads debug
466+
#
441467
BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y
442468

443469
#
@@ -450,7 +476,10 @@ BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y
450476
# BR2_PACKAGE_LMBENCH is not set
451477
# BR2_PACKAGE_LTP_TESTSUITE is not set
452478
# BR2_PACKAGE_LTRACE is not set
453-
# BR2_PACKAGE_LTTNG_BABELTRACE is not set
479+
480+
#
481+
# lttng-babeltrace needs a uclibc snapshot or (e)glib toolchain w/ wchar, threads
482+
#
454483
# BR2_PACKAGE_LTTNG_MODULES is not set
455484
# BR2_PACKAGE_LTTNG_TOOLS is not set
456485
# BR2_PACKAGE_MCELOG is not set
@@ -472,7 +501,10 @@ BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y
472501
# BR2_PACKAGE_SPIDEV_TEST is not set
473502
# BR2_PACKAGE_STRACE is not set
474503
# BR2_PACKAGE_STRESS is not set
475-
# BR2_PACKAGE_STRESS_NG is not set
504+
505+
#
506+
# stress-ng needs a glibc toolchain w/ dynamic library, headers >= 3.3
507+
#
476508

477509
#
478510
# sysdig needs a toolchain w/ C++, dynamic library and a Linux kernel to be built
@@ -502,7 +534,7 @@ BR2_PACKAGE_CMAKE_ARCH_SUPPORTS=y
502534
# BR2_PACKAGE_CVS is not set
503535
# BR2_PACKAGE_FLEX is not set
504536
# BR2_PACKAGE_GETTEXT is not set
505-
BR2_PACKAGE_GIT=y
537+
# BR2_PACKAGE_GIT is not set
506538

507539
#
508540
# gperf needs a toolchain w/ C++
@@ -519,7 +551,7 @@ BR2_PACKAGE_GIT=y
519551
#
520552
# Filesystem and flash utilities
521553
#
522-
# BR2_PACKAGE_BTRFS_PROGS is not set
554+
BR2_PACKAGE_BTRFS_PROGS=y
523555
# BR2_PACKAGE_CIFS_UTILS is not set
524556
# BR2_PACKAGE_CPIO is not set
525557
# BR2_PACKAGE_CRAMFS is not set
@@ -533,9 +565,12 @@ BR2_PACKAGE_E2FSPROGS=y
533565
# BR2_PACKAGE_E2FSPROGS_E2FREEFRAG is not set
534566
# BR2_PACKAGE_E2FSPROGS_E2FSCK is not set
535567
# BR2_PACKAGE_E2FSPROGS_E2IMAGE is not set
536-
BR2_PACKAGE_E2FSPROGS_E2LABEL=y
568+
# BR2_PACKAGE_E2FSPROGS_E2LABEL is not set
537569
# BR2_PACKAGE_E2FSPROGS_E2UNDO is not set
538-
# BR2_PACKAGE_E2FSPROGS_E4DEFRAG is not set
570+
571+
#
572+
# e4defrag needs an (e)glibc or musl toolchain
573+
#
539574
# BR2_PACKAGE_E2FSPROGS_FILEFRAG is not set
540575
# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
541576
# BR2_PACKAGE_E2FSPROGS_FSCK is not set
@@ -544,7 +579,7 @@ BR2_PACKAGE_E2FSPROGS_E2LABEL=y
544579
BR2_PACKAGE_E2FSPROGS_MKE2FS=y
545580
# BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND is not set
546581
# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
547-
BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
582+
# BR2_PACKAGE_E2FSPROGS_TUNE2FS is not set
548583
# BR2_PACKAGE_E2FSPROGS_UUIDGEN is not set
549584
# BR2_PACKAGE_E2TOOLS is not set
550585
# BR2_PACKAGE_ECRYPTFS_UTILS is not set
@@ -566,11 +601,7 @@ BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
566601
# BR2_PACKAGE_SQUASHFS is not set
567602
# BR2_PACKAGE_SSHFS is not set
568603
# BR2_PACKAGE_UNIONFS is not set
569-
570-
#
571-
# Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED and UCLIBC_HAS_OBSOLETE_BSD_SIGNAL enabled
572-
#
573-
BR2_PACKAGE_XFSPROGS=y
604+
# BR2_PACKAGE_XFSPROGS is not set
574605

575606
#
576607
# Fonts, icons, sounds and themes
@@ -784,16 +815,17 @@ BR2_PACKAGE_ACPID=y
784815
# lshw needs a toolchain w/ C++, wchar
785816
#
786817
# BR2_PACKAGE_LSUIO is not set
787-
BR2_PACKAGE_LVM2=y
788-
BR2_PACKAGE_LVM2_STANDARD_INSTALL=y
789-
# BR2_PACKAGE_LVM2_APP_LIBRARY is not set
818+
# BR2_PACKAGE_LVM2 is not set
790819
# BR2_PACKAGE_MDADM is not set
791820
# BR2_PACKAGE_MEMTEST86 is not set
792821
# BR2_PACKAGE_MEMTESTER is not set
793822
# BR2_PACKAGE_MINICOM is not set
794823
# BR2_PACKAGE_NANOCOM is not set
795824
# BR2_PACKAGE_NEARD is not set
796-
# BR2_PACKAGE_NVIDIA_DRIVER is not set
825+
826+
#
827+
# nvidia-driver needs an (e)glibc toolchain
828+
#
797829
# BR2_PACKAGE_OFONO is not set
798830

799831
#
@@ -972,7 +1004,7 @@ BR2_PACKAGE_MONO_ARCH_SUPPORTS=y
9721004
# libsquish needs a toolchain w/ C++, dynamic library
9731005
#
9741006
# BR2_PACKAGE_LIBZIP is not set
975-
# BR2_PACKAGE_LZO is not set
1007+
BR2_PACKAGE_LZO=y
9761008

9771009
#
9781010
# snappy needs a toolchain w/ C++
@@ -1499,6 +1531,7 @@ BR2_PACKAGE_LIBTIRPC=y
14991531
#
15001532
# BR2_PACKAGE_APR is not set
15011533
# BR2_PACKAGE_APR_UTIL is not set
1534+
# BR2_PACKAGE_ARGP_STANDALONE is not set
15021535

15031536
#
15041537
# armadillo needs a toolchain w/ C++
@@ -1559,7 +1592,10 @@ BR2_PACKAGE_BOOST_ARCH_SUPPORTS=y
15591592
BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS=y
15601593
# BR2_PACKAGE_LIBATOMIC_OPS is not set
15611594
BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS=y
1562-
# BR2_PACKAGE_LIBBSD is not set
1595+
1596+
#
1597+
# libbsd needs an (e)glibc toolchain w/ threads
1598+
#
15631599
# BR2_PACKAGE_LIBCAP is not set
15641600
# BR2_PACKAGE_LIBCAP_NG is not set
15651601

@@ -1604,12 +1640,21 @@ BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT=y
16041640
# BR2_PACKAGE_LIBTPL is not set
16051641
# BR2_PACKAGE_LIBUBOX is not set
16061642
# BR2_PACKAGE_LIBUCI is not set
1607-
# BR2_PACKAGE_LIBUNWIND is not set
1643+
1644+
#
1645+
# libunwind needs a uclibc snapshot or (e)glibc toolchain w/ threads
1646+
#
16081647
# BR2_PACKAGE_LIBURCU is not set
16091648
# BR2_PACKAGE_LIBUV is not set
16101649
# BR2_PACKAGE_LIGHTNING is not set
1611-
# BR2_PACKAGE_LINUX_PAM is not set
1612-
# BR2_PACKAGE_LIQUID_DSP is not set
1650+
1651+
#
1652+
# linux-pam needs a uClibc or (e)glibc toolchain w/ wchar, locale, dynamic library
1653+
#
1654+
1655+
#
1656+
# liquid-dsp requires a (e)glibc/musl toolchain w/ dynamic library
1657+
#
16131658
# BR2_PACKAGE_LTTNG_LIBUST is not set
16141659
# BR2_PACKAGE_MPC is not set
16151660
# BR2_PACKAGE_MPDECIMAL is not set
@@ -1658,6 +1703,7 @@ BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT=y
16581703
# BR2_PACKAGE_LIBENCA is not set
16591704
# BR2_PACKAGE_LIBESTR is not set
16601705
# BR2_PACKAGE_LIBFRIBIDI is not set
1706+
# BR2_PACKAGE_LIBICONV is not set
16611707
# BR2_PACKAGE_LIBUNISTRING is not set
16621708
# BR2_PACKAGE_LINENOISE is not set
16631709
# BR2_PACKAGE_NCURSES is not set
@@ -1831,10 +1877,6 @@ BR2_PACKAGE_IPTABLES=y
18311877
# modemmanager needs udev /dev management and a toolchain w/ wchar, threads
18321878
#
18331879
# BR2_PACKAGE_MONGOOSE is not set
1834-
1835-
#
1836-
# mongrel2 needs a toolchain w/ C++, threads, wchar, dynamic library
1837-
#
18381880
# BR2_PACKAGE_MONKEY is not set
18391881
# BR2_PACKAGE_MOSQUITTO is not set
18401882
# BR2_PACKAGE_MROUTED is not set
@@ -1881,6 +1923,10 @@ BR2_PACKAGE_NTP_SNTP=y
18811923
# BR2_PACKAGE_OPENVPN is not set
18821924
# BR2_PACKAGE_P910ND is not set
18831925
# BR2_PACKAGE_PHIDGETWEBSERVICE is not set
1926+
1927+
#
1928+
# portmap needs a toolchain w/ RPC
1929+
#
18841930
# BR2_PACKAGE_PPPD is not set
18851931
# BR2_PACKAGE_PPTP_LINUX is not set
18861932
# BR2_PACKAGE_PROFTPD is not set
@@ -1898,7 +1944,10 @@ BR2_PACKAGE_RPCBIND=y
18981944
# rtorrent needs a toolchain w/ C++, threads, wchar
18991945
#
19001946
# BR2_PACKAGE_RTPTOOLS is not set
1901-
# BR2_PACKAGE_SAMBA4 is not set
1947+
1948+
#
1949+
# samba4 needs an (e)glibc or uClibc-ng toolchain w/ RPC, wchar, dynamic library, threads
1950+
#
19021951

19031952
#
19041953
# sconeserver needs a toolchain w/ C++, NPTL
@@ -2070,7 +2119,10 @@ BR2_PACKAGE_INITSCRIPTS=y
20702119
# BR2_PACKAGE_IRQBALANCE is not set
20712120
# BR2_PACKAGE_KEYUTILS is not set
20722121
# BR2_PACKAGE_KMOD is not set
2073-
# BR2_PACKAGE_KVMTOOL is not set
2122+
2123+
#
2124+
# kvmtool needs a (e)glibc or musl toolchain
2125+
#
20742126
# BR2_PACKAGE_LXC is not set
20752127
# BR2_PACKAGE_MONIT is not set
20762128
# BR2_PACKAGE_NCDU is not set
@@ -2079,7 +2131,10 @@ BR2_PACKAGE_INITSCRIPTS=y
20792131
#
20802132
# nut needs a toolchain w/ C++
20812133
#
2082-
# BR2_PACKAGE_OPENVMTOOLS is not set
2134+
2135+
#
2136+
# openvmtools needs an (e)glibc or musl toolchain w/ wchar, threads, RPC, locale
2137+
#
20832138
# BR2_PACKAGE_POLKIT is not set
20842139
# BR2_PACKAGE_PWGEN is not set
20852140
# BR2_PACKAGE_QUOTA is not set

0 commit comments

Comments
 (0)