From 2c24045cf0a740f8296d1ada988394125668dd3e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Wed, 16 Oct 2019 20:23:40 -0300 Subject: [PATCH] make preparatives for the new version --- archive/etc/os-release | 2 +- archive/kernel/config-x86_64_generic | 36 ++++++++------------------- archive/kernel/config-x86_generic | 25 ++++++------------- packages/makeISO | 47 ++++++++++++++++++++++++++++++++++++ recipes/data/etc/recipe | 2 +- stages/2/04-iso | 2 +- 6 files changed, 68 insertions(+), 46 deletions(-) create mode 100755 packages/makeISO diff --git a/archive/etc/os-release b/archive/etc/os-release index 18132b0a..3b100463 100644 --- a/archive/etc/os-release +++ b/archive/etc/os-release @@ -5,4 +5,4 @@ VERSION_CODENAME=D3 VERSION_ID=3.0 PRETTY_NAME="Dragora GNU/Linux-Libre 3.0" HOME_URL=http://www.dragora.org -BUILD_ID=20191013 +BUILD_ID=20191014 diff --git a/archive/kernel/config-x86_64_generic b/archive/kernel/config-x86_64_generic index 8d16702e..734368dc 100644 --- a/archive/kernel/config-x86_64_generic +++ b/archive/kernel/config-x86_64_generic @@ -785,15 +785,12 @@ CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y -CONFIG_KPROBES=y +# CONFIG_KPROBES is not set CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set -CONFIG_OPTPROBES=y -CONFIG_KPROBES_ON_FTRACE=y CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -899,7 +896,7 @@ CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_THROTTLING_LOW is not set -CONFIG_BLK_CMDLINE_PARSER=y +# CONFIG_BLK_CMDLINE_PARSER is not set CONFIG_BLK_WBT=y CONFIG_BLK_CGROUP_IOLATENCY=y CONFIG_BLK_WBT_SQ=y @@ -2040,17 +2037,7 @@ CONFIG_REGMAP_MMIO=y CONFIG_REGMAP_IRQ=y CONFIG_DMA_SHARED_BUFFER=y # CONFIG_DMA_FENCE_TRACE is not set -CONFIG_DMA_CMA=y - -# -# Default contiguous memory area size: -# -CONFIG_CMA_SIZE_MBYTES=16 -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_ALIGNMENT=8 +# CONFIG_DMA_CMA is not set # # Bus devices @@ -8076,7 +8063,8 @@ CONFIG_F2FS_CHECK_FS=y CONFIG_F2FS_FS_ENCRYPTION=y CONFIG_F2FS_IO_TRACE=y # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_FS_DAX is not set +CONFIG_FS_DAX=y +CONFIG_FS_DAX_PMD=y CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_EXPORTFS_BLOCK_OPS=y @@ -8375,7 +8363,7 @@ CONFIG_KEYS_COMPAT=y # CONFIG_PERSISTENT_KEYRINGS is not set # CONFIG_BIG_KEYS is not set CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=y CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y @@ -8571,10 +8559,10 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m # CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_842 is not set +CONFIG_CRYPTO_842=m CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4HC=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m # # Random Number Generation @@ -8664,6 +8652,8 @@ CONFIG_LIBCRC32C=y CONFIG_CRC8=m CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set +CONFIG_842_COMPRESS=m +CONFIG_842_DECOMPRESS=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZIP_DECOMPRESS=y @@ -8869,7 +8859,6 @@ CONFIG_RCU_TRACE=y # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set -CONFIG_FUNCTION_ERROR_INJECTION=y # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_USER_STACKTRACE_SUPPORT=y @@ -8905,15 +8894,12 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_STACK_TRACER=y # CONFIG_BLK_DEV_IO_TRACE is not set -CONFIG_KPROBE_EVENTS=y -# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y # CONFIG_FUNCTION_PROFILER is not set -# CONFIG_BPF_KPROBE_OVERRIDE is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_MMIOTRACE is not set @@ -8930,7 +8916,6 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_LKDTM is not set # CONFIG_TEST_LIST_SORT is not set CONFIG_TEST_SORT=m -# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set @@ -8978,7 +8963,6 @@ CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_DEBUG is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y -# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 diff --git a/archive/kernel/config-x86_generic b/archive/kernel/config-x86_generic index 0b33549a..fffc0562 100644 --- a/archive/kernel/config-x86_generic +++ b/archive/kernel/config-x86_generic @@ -788,14 +788,11 @@ CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y -CONFIG_KPROBES=y +# CONFIG_KPROBES is not set CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set -CONFIG_OPTPROBES=y -CONFIG_KPROBES_ON_FTRACE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -888,7 +885,7 @@ CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_THROTTLING_LOW is not set -CONFIG_BLK_CMDLINE_PARSER=y +# CONFIG_BLK_CMDLINE_PARSER is not set CONFIG_BLK_WBT=y CONFIG_BLK_CGROUP_IOLATENCY=y CONFIG_BLK_WBT_SQ=y @@ -8112,7 +8109,7 @@ CONFIG_F2FS_CHECK_FS=y CONFIG_F2FS_FS_ENCRYPTION=y CONFIG_F2FS_IO_TRACE=y # CONFIG_F2FS_FAULT_INJECTION is not set -# CONFIG_FS_DAX is not set +CONFIG_FS_DAX=y CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_EXPORTFS_BLOCK_OPS=y @@ -8408,7 +8405,7 @@ CONFIG_KEYS=y # CONFIG_PERSISTENT_KEYRINGS is not set # CONFIG_BIG_KEYS is not set CONFIG_TRUSTED_KEYS=m -CONFIG_ENCRYPTED_KEYS=m +CONFIG_ENCRYPTED_KEYS=y CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y @@ -8574,10 +8571,10 @@ CONFIG_CRYPTO_TWOFISH_586=m # CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_842 is not set +CONFIG_CRYPTO_842=m CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4HC=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m # # Random Number Generation @@ -8667,6 +8664,8 @@ CONFIG_CRC8=m CONFIG_XXHASH=y CONFIG_AUDIT_GENERIC=y # CONFIG_RANDOM32_SELFTEST is not set +CONFIG_842_COMPRESS=m +CONFIG_842_DECOMPRESS=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_LZIP_DECOMPRESS=y @@ -8861,7 +8860,6 @@ CONFIG_RCU_TRACE=y # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_NOTIFIER_ERROR_INJECTION is not set -CONFIG_FUNCTION_ERROR_INJECTION=y # CONFIG_FAULT_INJECTION is not set # CONFIG_LATENCYTOP is not set CONFIG_USER_STACKTRACE_SUPPORT=y @@ -8896,15 +8894,10 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_STACK_TRACER=y # CONFIG_BLK_DEV_IO_TRACE is not set -CONFIG_KPROBE_EVENTS=y -# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set # CONFIG_UPROBE_EVENTS is not set -CONFIG_BPF_EVENTS=y -CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y # CONFIG_FUNCTION_PROFILER is not set -CONFIG_BPF_KPROBE_OVERRIDE=y CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_MMIOTRACE is not set @@ -8921,7 +8914,6 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_LKDTM is not set # CONFIG_TEST_LIST_SORT is not set CONFIG_TEST_SORT=m -# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set @@ -8968,7 +8960,6 @@ CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y -# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 diff --git a/packages/makeISO b/packages/makeISO new file mode 100755 index 00000000..d2124a62 --- /dev/null +++ b/packages/makeISO @@ -0,0 +1,47 @@ +#! /bin/sh - +# +# Creates packages ISO (from current directory) +# +# Copyright (c) 2019 Matias Fonzo, . +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +MKISOFS="${MKISOFS:-mkisofs}" + +case $1 in +i586) + include_directory=i586 + exclude_path=x86_64 + ;; +x86_64) + include_directory=x86_64 + exclude_path=i586 + ;; +*) + echo "${0##*/}: it requires an argument 'i586' or 'x86_64' for the ISO" 1>&2 + exit 1; +esac + +ISONAME="${ISONAME:-dragora-3.0_$(date +%Y%m%d)-${include_directory}-packages}" + +rm -f -v $ISONAME + +$MKISOFS -v -o ${ISONAME}.iso \ + -A 'Dragora Packages' -V 'Dragora Packages' \ + -m '.keep' -m "${0##*/}" -m 'makeTags' \ + -x "dragora-*.iso*" -x $exclude_path \ + -R -J -U -hide-rr-moved . + +echo "Making .sha256 sum ..." +sha256sum ${ISONAME}.iso > ${ISONAME}.iso.sha256 + diff --git a/recipes/data/etc/recipe b/recipes/data/etc/recipe index 013f2464..f34b432c 100644 --- a/recipes/data/etc/recipe +++ b/recipes/data/etc/recipe @@ -16,7 +16,7 @@ program=_etc version=dragora -pkgversion=20191013 +pkgversion=20191014 arch=noarch release=1 diff --git a/stages/2/04-iso b/stages/2/04-iso index ad99756a..886fb3d7 100755 --- a/stages/2/04-iso +++ b/stages/2/04-iso @@ -16,7 +16,7 @@ # limitations under the License. # ISO file name -ISONAME="dragora-3.0_$(date +%Y%m%d)-${arch}" +ISONAME="${ISONAME:-dragora-3.0_$(date +%Y%m%d)-${arch}}" # Default mkisofs(8) invocation name MKISOFS=mkisofs -- 2.11.4.GIT