From b9c917f266201e519964238ed8580b3f1049729a Mon Sep 17 00:00:00 2001 From: Miguel Bernal Marin Date: Fri, 5 Oct 2018 16:37:51 -0500 Subject: [PATCH] rename subpackage standard to main --- Makefile.custom | 14 ++--- README.clear | 2 +- ...ot-lts2018-standard => cmdline-iot-lts2018 | 0 ...iot-lts2018-standard => config-iot-lts2018 | 0 ...t-lts2018-standard => fragment-iot-lts2018 | 0 linux-iot-lts2018.spec | 52 +++++-------------- 6 files changed, 22 insertions(+), 46 deletions(-) rename cmdline-iot-lts2018-standard => cmdline-iot-lts2018 (100%) rename config-iot-lts2018-standard => config-iot-lts2018 (100%) rename fragment-iot-lts2018-standard => fragment-iot-lts2018 (100%) diff --git a/Makefile.custom b/Makefile.custom index 5a32bb04..418e4141 100644 --- a/Makefile.custom +++ b/Makefile.custom @@ -7,20 +7,20 @@ config-%: $(SRPMFILE) fragment-% $(MOCK) $(MOCK_COMMON_ARGS) --cwd=/builddir/build/BUILD --chroot 'apply-kconfig $(foreach infile,$(notdir $(filter-out %.rpm,$^)),/tmp/$(infile))' $(MOCK) $(MOCK_COMMON_ARGS) --copyout /builddir/build/BUILD/linux-*/.config $@ -config: config-pk414-sos config-pk414-standard +config: config-iot-lts2018 config-iot-lts2018-sos genfragment-sos: $(SRPMFILE) $(MOCK) $(MOCK_COMMON_ARGS) --installdeps $(SRPMFILE) $(MOCK) $(MOCK_COMMON_ARGS) --chroot 'rpmbuild -bp /builddir/build/SPECS/$(SPECFILE)' - $(MOCK) $(MOCK_COMMON_ARGS) --copyin config-pk414-sos /tmp/ - $(MOCK) $(MOCK_COMMON_ARGS) --cwd=/builddir/build/BUILD --chroot 'update-fragment /tmp/config-pk414-sos' - $(MOCK) $(MOCK_COMMON_ARGS) --copyout /builddir/build/BUILD/linux-*/.fragment fragment-pk414-sos + $(MOCK) $(MOCK_COMMON_ARGS) --copyin config-iot-lts2018-sos /tmp/ + $(MOCK) $(MOCK_COMMON_ARGS) --cwd=/builddir/build/BUILD --chroot 'update-fragment /tmp/config-iot-lts2018-sos' + $(MOCK) $(MOCK_COMMON_ARGS) --copyout /builddir/build/BUILD/linux-*/.fragment fragment-iot-lts2018-sos genfragment-standard: $(SRPMFILE) $(MOCK) $(MOCK_COMMON_ARGS) --installdeps $(SRPMFILE) $(MOCK) $(MOCK_COMMON_ARGS) --chroot 'rpmbuild -bp /builddir/build/SPECS/$(SPECFILE)' - $(MOCK) $(MOCK_COMMON_ARGS) --copyin config-pk414-standard /tmp/ - $(MOCK) $(MOCK_COMMON_ARGS) --cwd=/builddir/build/BUILD --chroot 'update-fragment /tmp/config-pk414-standard' - $(MOCK) $(MOCK_COMMON_ARGS) --copyout /builddir/build/BUILD/linux-*/.fragment fragment-pk414-standard + $(MOCK) $(MOCK_COMMON_ARGS) --copyin config-iot-lts2018 /tmp/ + $(MOCK) $(MOCK_COMMON_ARGS) --cwd=/builddir/build/BUILD --chroot 'update-fragment /tmp/config-iot-lts2018' + $(MOCK) $(MOCK_COMMON_ARGS) --copyout /builddir/build/BUILD/linux-*/.fragment fragment-iot-lts2018 genfragment: genfragment-sos genfragment-standard diff --git a/README.clear b/README.clear index 49c5e0d6..c409b7dc 100644 --- a/README.clear +++ b/README.clear @@ -1,7 +1,7 @@ This kernel repository uses layered configuration For configuration changes, always make the change to the file -fragment-pk414-sos and/or fragment-pk414-standard, then run `make +fragment-iot-lts2018 and/or fragment-iot-lts2018-sos, then run `make config` to re-generate the build-time config files, and commit the results. diff --git a/cmdline-iot-lts2018-standard b/cmdline-iot-lts2018 similarity index 100% rename from cmdline-iot-lts2018-standard rename to cmdline-iot-lts2018 diff --git a/config-iot-lts2018-standard b/config-iot-lts2018 similarity index 100% rename from config-iot-lts2018-standard rename to config-iot-lts2018 diff --git a/fragment-iot-lts2018-standard b/fragment-iot-lts2018 similarity index 100% rename from fragment-iot-lts2018-standard rename to fragment-iot-lts2018 diff --git a/linux-iot-lts2018.spec b/linux-iot-lts2018.spec index 6ffe656c..d5fee105 100644 --- a/linux-iot-lts2018.spec +++ b/linux-iot-lts2018.spec @@ -3,12 +3,14 @@ # This kernel is an "enterprise style" kernel with a significant list of # backported features # -# There are two subpackages "sos" and "standard" +# This package has a main package "standard" and a subpackage "sos" +# +# The "standard" kernel (the main package) is meant for running on +# bare metal systems as well as running as a "normal" guest in +# various hypervisors. This # # The "sos" kernel is specifically meant to run as DOM0 in an # ACRN hypervisor setup. -# The "standard" kernel is meant for running on bare metal systems as well -# as running as a "normal" guest in various hypervisors # Name: linux-iot-lts2018 @@ -19,35 +21,22 @@ Summary: The Linux kernel Url: http://www.kernel.org/ Group: kernel Source0: https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.73.tar.xz -Source1: config-iot-lts2018-sos -Source2: config-iot-lts2018-standard -Source3: cmdline-iot-lts2018-sos -Source4: cmdline-iot-lts2018-standard +Source1: config-iot-lts2018 +Source2: config-iot-lts2018-sos +Source3: cmdline-iot-lts2018 +Source4: cmdline-iot-lts2018-sos # kernel-lts-quilt: lts-v4.14.73-base-181002T012100Z # kernel-config: lts-v4.14.73-base-181002T012100Z -%define ktarget0 iot-lts2018-sos +%define ktarget0 iot-lts2018 %define kversion0 %{version}-%{release}.%{ktarget0} -%define ktarget1 iot-lts2018-standard +%define ktarget1 iot-lts2018-sos %define kversion1 %{version}-%{release}.%{ktarget1} -BuildRequires: bash >= 2.03 -BuildRequires: bc -BuildRequires: binutils-dev -BuildRequires: elfutils-dev -BuildRequires: kernel-config -BuildRequires: make >= 3.78 -BuildRequires: openssl-dev -BuildRequires: flex -BuildRequires: bison -BuildRequires: kmod -BuildRequires: linux-firmware -BuildRequires: lz4 +BuildRequires: buildreq-kernel Requires: systemd-bin -Requires: linux-iot-lts2018-sos -Requires: linux-iot-lts2018-standard # don't strip .ko files! %global __os_install_post %{nil} @@ -63,7 +52,7 @@ Requires: linux-iot-lts2018-standard # needs to add to PK series %description -The Linux kernel. +The Linux IOT LTS2018 kernel. %package sos License: GPL-2.0 @@ -73,14 +62,6 @@ Group: kernel %description sos The Linux kernel for Service OS -%package standard -License: GPL-2.0 -Summary: The Linux kernel for Linux as a Guest -Group: kernel - -%description standard -The Linux kernel for Linux as a Guest - %package extra License: GPL-2.0 Summary: The Linux kernel extra files @@ -160,11 +141,6 @@ rm -rf %{buildroot}/usr/lib/firmware %files %dir /usr/lib/kernel %dir /usr/lib/modules/%{kversion0} -%dir /usr/lib/modules/%{kversion1} - -%files sos -%dir /usr/lib/kernel -%dir /usr/lib/modules/%{kversion0} /usr/lib/kernel/config-%{kversion0} /usr/lib/kernel/cmdline-%{kversion0} /usr/lib/kernel/org.clearlinux.%{ktarget0}.%{version}-%{release} @@ -172,7 +148,7 @@ rm -rf %{buildroot}/usr/lib/firmware /usr/lib/modules/%{kversion0}/kernel /usr/lib/modules/%{kversion0}/modules.* -%files standard +%files sos %dir /usr/lib/kernel %dir /usr/lib/modules/%{kversion1} /usr/lib/kernel/config-%{kversion1}