Juli 2010 - Grml-devel - lists.mur.at

Re: [Grml-devel] [issue879] grml-live: Couldn't find package xserver-xorg-video-amd
by Tong Sun 29 Jul '10

29 Jul '10

On Thu, Jul 22, 2010 at 4:19 AM, Michael Prokop <bts(a)bts.grml.org> wrote: > > Anyway, as it's a transitional package we shouldn't need I've just > removed it in git of grml-live. > Actually, IMHO, better yet is to remove all xserver-xorg-videos but xserver-xorg-video-all, and all xserver-xorg-inputs except xserver-xorg-input-all. I would think it would be OK, wouldn't it? Thanks

2 3

Working with git and sending in patches
by Tong Sun 29 Jul '10

29 Jul '10

Hi, Just trying to put all jigsaw puzzle together here. Please correct me if I'm wrong. First of all, philosophy for version control with git: . While developing, small/independent commits are good thing, so that it's easy to decouple different changes. . But when integrating something in a main branch, commits should contain all logical/related changes. Steps (using grml-debootstrap as an example): - do initial git pull into grml-debootstrap git pull git://git.grml.org/grml-debootstrap master - Go into grml-debootstrap and start a new branch git checkout -b t/my-working-branch - work on the code, commit, hack, commit, hack, commit -- commit often & commit small - when AOK and need to integrate patches into main branch, squash all patches into one git rebase -i origin/master - send in patches via email (to grml-devel(a)ml.grml.org) git format-patch origin git send-email --to grml-devel(a)ml.grml.org ... Please correct me if anything above is wrong. Now, question, having following the above, I am having problem pulling in the latest master from head: $ git pull [ . . . ] You asked me to pull without telling me which branch you want to merge with, and 'branch.t/apt_cache.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull <repository> <refspec>'). See git-pull(1) for details. $ git pull git://git.grml.org/grml-debootstrap master >From git://git.grml.org/grml-debootstrap * branch master -> FETCH_HEAD Auto-merging chroot-script CONFLICT (content): Merge conflict in chroot-script Auto-merging cmdlineopts.clp CONFLICT (content): Merge conflict in cmdlineopts.clp Auto-merging config Auto-merging grml-debootstrap CONFLICT (content): Merge conflict in grml-debootstrap Auto-merging grml-debootstrap.8.txt Automatic merge failed; fix conflicts and then commit the result. So, - what's the normal steps here to pulling in the latest master from head? - how to solve the above specific problem? I'm thinking just to abandon this directory and pull from git from scratch again. Thanks

2 3

grml-live: ISO_OUTPUT ignored?
by Tong Sun 24 Jul '10

24 Jul '10

Hi, I have the following in my /etc/grml/grml-live.local ----------------------------------------- grep -1 OUTPUT /etc/grml/grml-live.local # Main output directory OUTPUT="/dev/shm/gl" # mount -o remount,suid,dev,rw /dev/shm # Where do want to find the chroot of the buildprocess files? # CHROOT_OUTPUT="$OUTPUT/grml_chroot" # Where do you want to find the compressed chroot, bootstuff,...? # BUILD_OUTPUT="$OUTPUT/grml_cd" # Where do you want to find the final ISO? ISO_OUTPUT="/lfs/cache12/systems/distros" ----------------------------------------- and I invoked grml-live as % rm /dev/shm/gl/grml_isos/depen64.iso % grml-live -F -a $ARCH -c $CLASSES -g $USE_NAME -v "`date -I`" -i $USE_NAME.iso * Logging actions to logfile /var/log/grml-live.log * Skiping stage 'fai dirinstall' as /dev/shm/gl/grml_chroot exists alr [ ok ] * Skipping stage 'boot' as /dev/shm/gl/grml_cd/boot/isolinux exists al [ ok ] * Skipping stage 'squashfs' as /dev/shm/gl/grml_cd/live exists already [ ok ] Size of boot image is 4 sectors -> No emulation 9.81% done, estimate finish Wed Jul 21 11:15:22 2010 19.63% done, estimate finish Wed Jul 21 11:15:22 2010 29.41% done, estimate finish Wed Jul 21 11:15:22 2010 39.23% done, estimate finish Wed Jul 21 11:15:22 2010 49.01% done, estimate finish Wed Jul 21 11:15:22 2010 58.83% done, estimate finish Wed Jul 21 11:15:22 2010 68.61% done, estimate finish Wed Jul 21 11:15:22 2010 78.43% done, estimate finish Wed Jul 21 11:15:22 2010 88.22% done, estimate finish Wed Jul 21 11:15:22 2010 98.00% done, estimate finish Wed Jul 21 11:15:22 2010 Total translation table size: 2048 Total rockridge attributes bytes: 23099 Total directory bytes: 45056 Path table size(bytes): 118 Max brk space used 33000 51021 extents written (99 MB) * Creating hybrid ISO file with manifold method geometry is 204288 sectors (104595456 bytes) in 399 cylinders, 16 heads, 32 sectors per track 0 @0x168: 60 @4 (0x4) - 0x168: 32 (0x20) @ 4 (0x4) - 0x16A: 28 (0x1C) @ 36 (0x24) using 2 blocks, 4 bytes (82 free) using sectors of 2^9 = 512 bytes [ ok ] * Finished execution of stage 'iso build' [ ok ] * Successfully finished execution of grml-live [Wed Jul 21 11:15:23 EDT 2010 - running 3 seconds] [ ok ] However, the iso is still generated at /dev/shm/gl/grml_isos/depen64.iso. Do I need to remove more stage files for ISO_OUTPUT to take effect? Thanks

2 2

[issue] grml-live: grml-live.local ignored
by Tong Sun 21 Jul '10

21 Jul '10

Hi, I found that the file /etc/grml/grml-live.local is ignored by grml-live $ head /etc/grml/grml-live.local # Set UTC=yes if your system clock is set to UTC (GMT) and UTC=no if not. UTC=yes TIMEZONE=America/Toronto # Which Debian suite to you want to use? SUITE="sid" # Which bootloader do you want to use? Default: isolinux # Supported values: isolinux, grub # BOOT_METHOD='isolinux' . . . # Where do you want to find the final ISO? ISO_OUTPUT="/lfs/cache12/systems/distros" % grml-live -F -a $ARCH -c $CLASSES -o /dev/shm/gl -g $USE_NAME -v "`date -I`" -i $USE_NAME.iso Using configuration files from /etc/grml/fai Calling task_confdir FAI_FLAGS: No monitor daemon defined. FAI_CONFIG_SRC is set to file:///etc/grml/fai/config Using local path /etc/grml/fai/config as config space. Calling task_setup FAI_FLAGS: Calling task_defclass List of all classes: GRMLBASE KERNEL REMOVE_DOCS RELEASE AMD64 Calling task_defvar ++ FAI_ALLOW_UNSIGNED=1 ++ CONSOLEFONT= ++ KEYMAP=us-latin1 ++ UTC=no ++ TIMEZONE=Europe/Vienna ++ ROOTPW=x Calling task_action FAI_ACTION: dirinstall Calling task_dirinstall Installing into directory /dev/shm/gl/grml_chroot Calling task_extrbase Unpacking Debian base archive No base.tgz found. Calling debootstrap. Creating base system using debootstrap version 1.0.22 Calling debootstrap --arch amd64 --exclude=info sid /dev/shm/gl/grml_chroot http://cdn.debian.net/debian . . . >From above log, and where my .iso is generated, I think the file /etc/grml/grml-live.local has no effect to grml-live. Please verify. Thanks tong

2 3

Propose to centralize kernel specification for grml-live
by Tong Sun 21 Jul '10

21 Jul '10

Hi, Currently, the kernel is specified at multiple places under package_config: $ grep -c linux-image * GRMLBASE:0 GRML_FULL:2 GRML_MEDIUM:2 GRML_POWERPC:0 GRML_SMALL:2 LATEX:0 XORG:0 This, IMHO, creates unnecessary complication for maintenance. I think it is better to centralize kernel specification in one file, say, GRMLBASE, or KERNEL (or whatever). BTW, The following tested fine. $ cat KERNEL PACKAGES aptitude I386 linux-image-2.6.33-grml PACKAGES aptitude AMD64 linux-image-2.6.33-grml64 CLASSES='GRMLBASE,KERNEL,...'

2 2

Re: [Grml-devel] [issue879] grml-live: Couldn't find package xserver-xorg-video-amd
by Tong Sun 15 Jul '10

15 Jul '10

On Thu, Jul 15, 2010 at 5:12 AM, Michael Prokop <bts(a)bts.grml.org> wrote: > > Michael Prokop <mika(a)grml.org> added the comment: > > * Tong Sun wrote in grml's BTS on 20100715 / 07:06: > > > SUITE=sid > > CLASSES='GRMLBASE,XORG,REMOVE_DOCS,RELEASE,AMD64' > > ARCH=amd64 > > > % grml-live -F -a $ARCH -s $SUITE -c $CLASSES -o /dev/shm/gl -g $USE_NAME > -v > > "`date -I`" -r $USE_NAME -i $USE_NAME.iso > > . . . > > instsoft.GRMLBASE OK. > > Calling task_instsoft > > Installing software may take a while > > Couldn't find any package whose name or description matched > > "xserver-xorg-video-amd" > [...] > > * Error: there was a critical error during execution of stage 'fai > > dirinstall' > > * Note: check out /var/log/fai/grml/last/ for details. [exit 2] > [ > > !! ] > > The lack of xserver-xorg-video-amd shouldn't be the source for the > error unless you set EXIT_ON_MISSING_PACKAGES or modified > STOP_ON_ERROR. > Oh, sorry, maybe these: . . . GRMLBASE/05-hostname OK. Executing shell: GRMLBASE/10-build-initramfs GRMLBASE/10-build-initramfs FAILED with exit code 1. Executing shell: GRMLBASE/15-initsetup GRMLBASE/15-initsetup OK. . . . Executing shell: GRMLBASE/98-clean-chroot GRMLBASE/98-clean-chroot FAILED with exit code 9. >From /var/log/fai/grml/last/shell.log: ===== shell: GRMLBASE/10-build-initramfs ===== fcopy: copied /etc/grml/fai/config/files/etc/live.conf/GRMLBASE to /dev/shm/gl/grml_chroot/etc/live.conf fcopy: copied /etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE to /dev/shm/gl/grml_chroot/usr/share/initramfs-tools/scripts/init-top/grml Error: No kernel found, can not create initramfs. Exiting. GRMLBASE/10-build-initramfs FAILED with exit code 1. . . . ===== shell: GRMLBASE/98-clean-chroot ===== * freshclam not installed [ ok ] * Updating PCI- and USB-ids Warning: update-pciids was not successfull --2010-07-15 06:02:38-- http://www.linux-usb.org/usb.ids Resolving maroon... failed: Name or service not known. wget: unable to resolve host address `maroon' update-usbids: download failed Warning: update-usbids was not successfull [ ok ] * nessus-update-plugins not installed [ ok ] * Cleaning documentation directories... [ ok ] * Creating /usr/share/info/... [ ok ] * /boot/config- not available. $KERNEL not set to correct value? [ !! ] GRMLBASE/98-clean-chroot FAILED with exit code 9. Strange, still "$KERNEL not set", I've put AMD64 in CLASSES this time.

1 0

[PATCH 1/2] Rename variables in update_grml_versions to be less confusing
by Christian Hofstaedtler 09 Jul '10

09 Jul '10

New names should be very clear in what they refer to. --- grml2usb | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/grml2usb b/grml2usb index 13c8249..dbf1ba9 100755 --- a/grml2usb +++ b/grml2usb @@ -1116,26 +1116,26 @@ def update_grml_versions(iso_mount, target): @target: path of the target mount point """ grml_target = target + '/grml/' - new_grml_version = search_file('grml-version', grml_target) - if new_grml_version: - orig_grml_version = search_file('grml-version', iso_mount) - if not orig_grml_version: - logging.warn("Warning: %s could not be found - can not install it", orig_grml_version) + target_grml_version_file = search_file('grml-version', grml_target) + if target_grml_version_file: + iso_grml_version_file = search_file('grml-version', iso_mount) + if not iso_grml_version_file: + logging.warn("Warning: %s could not be found - can not install it", iso_grml_version_file) return False try: - new_file = open(new_grml_version, 'a+') - new_flavours = [ get_flavour(l) for l in new_file.readlines() ] - - old_file = open(orig_grml_version, 'r') - old_lines = old_file.readlines() - for line in old_lines: - if not get_flavour(line) in new_flavours: - new_file.write(line) + target_file = open(target_grml_version_file, 'a+') + target_flavours = [ get_flavour(l) for l in target_file.readlines() ] + + iso_file = open(iso_grml_version_file, 'r') + iso_lines = iso_file.readlines() + for line in iso_lines: + if not get_flavour(line) in target_flavours: + target_file.write(line) except IOError: logging.warn("Warning: Could not write file") finally: - new_file.close() - old_file.close() + target_file.close() + iso_file.close() return True else: return False -- 1.7.1

2 2