From 5b8ea64c3ded5fe8a65f276411a308b029ae9d3a Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Wed, 28 Dec 2011 15:30:50 +0100 Subject: [PATCH] Clean out grml-live-compat grml-live already tries hard to not use these files. --- debian/NEWS | 121 +++------------------------------------- debian/control | 17 +++--- debian/grml-live-compat.install | 1 - debian/rules | 21 ------- 4 files changed, 15 insertions(+), 145 deletions(-) delete mode 100644 debian/grml-live-compat.install diff --git a/debian/NEWS b/debian/NEWS index 34929d2..c486687 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,116 +1,9 @@ -grml-live (0.15.0) unstable; urgency=low +grml-live-grml (0.18.0) unstable; urgency=low - 1) The new command line option -D supports setting a - configuration directory instead of /etc/grml/fai. This is - the same as setting GRML_FAI_CONFIG. + grml-live-compat has turned into an empty transitional package. + Instead of using the files previously provided by the compat + package, grml-live now uses the files directly from the chroot. + This has the implication that all addons that should be + available must be installed into the chroot. - 2) Removed /etc/grml/fai/apt/sources.list, thanks to a redesign - of sources.list handling which provides a more consistent - approach. /etc/apt/sources.list will no longer use entries from - GRML_LIVE_SOURCES once the system has been initially installed. - Now handling of sources.list works as follows: - - ${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list/GRML_LIVE_SOURCES_LIST - is generated based on $GRML_LIVE_SOURCES (if set by the user, - otherwise falling back to Grml repositories plus Debian). This - GRML_LIVE_SOURCES_LIST file then gets deployed on *fresh* - deployments. It won't be installed again when running grml-live - -u. This provides more flexibility combined with a more - transparent and consistent behaviour for the user. - - /etc/apt/sources.list.d/debian.list will be set up based on the - detected Debian suite and the files from - ${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_*. - - /etc/apt/sources.list/grml-stable.list will be deployed and - (depending on the build type) also - /etc/apt/sources.list.d/grml-testing.list might be installed. - - -- Michael Prokop Fri, 08 Jul 2011 13:45:45 +0200 - -grml-live (0.9.35) unstable; urgency=low - - The files from /etc/grml/fai/files have been moved to - /etc/grml/fai/config/files (and as a consequence - /etc/grml/fai/live-initramfs has been moved to - /etc/grml/fai/config/ as well). This is an important step - to use the config space and class concept of FAI in a more - decent and clean way. It allows much better customization. - - Please notice: If you didn't modify anything inside - /etc/grml/fai/files you can safely remove the directory. - Otherwise please check out the structure of the new - /etc/grml/fai/config/files layout and the fcopy command - used in /etc/grml/fai/config/scripts/GRMLBASE/* scripts to - incoorporate your changes. - - -- Michael Prokop Sat, 13 Feb 2010 01:35:43 +0100 - -grml-live (0.9.34) unstable; urgency=low - - This version introduces an additional package named grml-live-db. - The grml-live-db Debian package provides a simple way to put build - information of grml-live into a database. By default you have to do - nothing but install grml-live-db and during each invocation of - grml-live you'll get an additional entry in the sqlite3 database - /var/log/grml-live.db. If you want to customize the database logging - check out the grml-live-db manpage. - - Instead of ZERO_LOGFILE a new variable titled PRESERVE_LOGFILE has - been introduced. By default grml-live cleans the build logfile so - grml-live-db can work straight out-of-the-box. If you still want to - preserve your logfiles (e.g. when you don't want to use - grml-live-db) just enable the PRESERVE_LOGFILE option in your - grml-live configuration file. For backwards compatibility reasons the - ZERO_LOGFILE variable is still supported within grml-live but it's - strongly recommended to adjust configuration. - - -- Michael Prokop Sat, 30 Jan 2010 14:36:15 +0100 - -grml-live (0.9.4) unstable; urgency=low - - grml provides its own squashfs-tools again which support LZMA - compression with kernel 2.6.26-grml[64], please install the - Debian package squashfs-lzma-tools of the grml repository. - More details can be found in the grml-live docs. Please - check out the section "Current state of grml-live with - squashfs-tools and kernel" in the grml-live docs, being - shipped with this package as manpage grml-live(8) and - /usr/share/doc/grml-live/grml-live.html and being available - online at http://grml.org/grml-live/#current_state as well. - - grml migrated from Mercurial (hg) to Git as version control - system. If you are interested in using very recent grml-live - versions from our VCS please make sure to check out the docs. - http://git.grml.org/?p=grml-live.git - - -- Michael Prokop Tue, 30 Sep 2008 13:12:07 +0200 - -grml-live (0.9) unstable; urgency=low - - grml-live 0.9 features kernel 2.6.26-grml[64]. Using - squashfs-tools 1:3.2r2-9exp1 does not work with kernel - 2.6.26-grml when using LZMA compression though it works - fine when using ZLIB compression. - - Debian provides updated squashfs-tools 1:3.3-7. You can - safely upgrade as long as you don't need kernel - 2.6.23-grml[64] and/or LZMA compression. - - All these details can be found in the grml-live docs. Please - check out the section "Current state of grml-live with - squashfs-tools and kernel" in the grml-live docs, being - shipped with this package as manpage grml-live(8) and - /usr/share/doc/grml-live/grml-live.html and being available - online at http://grml.org/grml-live/#current_state as well. - - -- Michael Prokop Fri, 22 Aug 2008 08:32:44 +0200 - -grml-live (0.0.4) unstable; urgency=low - - The -t option for specifying the output directory has been - renamed into -o. The option -t now specifies the place where - templates for building the ISO can be found. - Do not forget to adjust present scripts you use with grml-live. - - -- Michael Prokop Sat, 06 Oct 2007 16:50:16 +0200 + -- Christian Hofstaedtler Wed, 28 Dec 2011 15:29:51 +0100 diff --git a/debian/control b/debian/control index 804831e..9a2283c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: grml Priority: extra Maintainer: Michael Prokop Uploaders: Christian Hofstaedtler -Build-Depends: debhelper (>= 7), pciutils, memtest86+, syslinux-common, ipxe, grub-pc-bin +Build-Depends: debhelper (>= 7) Standards-Version: 3.9.2 Homepage: http://grml.org/grml-live/ Vcs-git: git://git.grml.org/grml-live-grml.git @@ -17,16 +17,15 @@ Depends: ${misc:Depends} Recommends: grml-live Conflicts: grml-live (<< 0.9.13) Description: templates/boot/addons for grml-live - This package provides the boot addons known as the features - providing bootoptions bsd, dos, and grub. You can safely - skip this package if you don't need the addons. + This package provides the boot addons bsd4grml, FreeDOS + and the All-in-one GRUB. + You can safely skip this package if you don't need them. Package: grml-live-compat Architecture: all -Depends: ${misc:Depends}, grml-live-addons +Depends: ${misc:Depends} Recommends: grml-live Conflicts: grml-live-addons (<< 0.15.1~) -Description: templates/boot/addons unstable binaries for grml-live - This package provides files from unstable, to allow building - GRML on stable, and having all the boot templates actually work. - +Description: transitional package + This package surves no purpose except to easy upgrades + from previous versions. diff --git a/debian/grml-live-compat.install b/debian/grml-live-compat.install deleted file mode 100644 index 3d79a3c..0000000 --- a/debian/grml-live-compat.install +++ /dev/null @@ -1 +0,0 @@ -templates/compat/ usr/share/grml-live/templates/ diff --git a/debian/rules b/debian/rules index e67a18b..a0ebff3 100755 --- a/debian/rules +++ b/debian/rules @@ -33,27 +33,6 @@ install: build dh_testroot dh_prep dh_installdirs - # grub files - install -d debian/tmp/templates/compat/grub - cp -a /usr/lib/grub/*-pc/*.mod debian/tmp/templates/compat/grub/ - cp -a /usr/lib/grub/*-pc/*.o debian/tmp/templates/compat/grub/ - cp -a /usr/lib/grub/*-pc/*.lst debian/tmp/templates/compat/grub/ - cp -a /usr/share/grub/ascii.pf2 debian/tmp/templates/compat/grub/ - /usr/bin/grub-mkimage -d /usr/lib/grub/*-pc -o \ - debian/tmp/templates/compat/grub/core.img biosdisk iso9660 --format=i386-pc - # isolinux base files - install -d debian/tmp/templates/compat/isolinux - for file in isolinux.bin ifcpu64.c32 vesamenu.c32; do \ - cp -a "/usr/lib/syslinux/$${file}" debian/tmp/templates/compat/isolinux/ ; \ - done - # others - install -d debian/tmp/templates/compat/addons - cp -a /usr/lib/ipxe/ipxe.lkrn debian/tmp/templates/compat/addons/ - cp -a /usr/share/misc/pci.ids debian/tmp/templates/compat/addons/ - cp -a /boot/memtest86+.bin debian/tmp/templates/compat/addons/ - for file in memdisk chain.c32 hdt.c32 menu.c32; do \ - cp -a "/usr/lib/syslinux/$${file}" debian/tmp/templates/compat/addons/ ; \ - done # Build architecture-independent files here. binary-indep: build install -- 2.1.4