Nov 6, 2007, 11:01:53 AM (13 years ago)
Bruno Cornec
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod? silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian? keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René? Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

1 edited


  • branches/stable/mindi-busybox/include/platform.h

    r902 r1770  
    1212#if defined __GNUC__ && defined __GNUC_MINOR__
    1313# define __GNUC_PREREQ(maj, min) \
    14             ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
     14        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
    1616# define __GNUC_PREREQ(maj, min) 0
    3636#undef inline
    37 #if __STDC_VERSION__ > 199901L
     37#if defined(__STDC_VERSION__) && __STDC_VERSION__ > 199901L
    3838/* it's a keyword */
    5454# define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m)))
    5555# if __GNUC_PREREQ (3,0)
    56 #  define ATTRIBUTE_ALWAYS_INLINE __attribute__ ((always_inline)) inline
     56#  define ALWAYS_INLINE __attribute__ ((always_inline)) inline
     57#  if !ENABLE_WERROR
     58#   define ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
     59#   define ATTRIBUTE_UNUSED_RESULT __attribute__ ((warn_unused_result))
     60#  else
     61#   define ATTRIBUTE_DEPRECATED /* n/a */
     62#   define ATTRIBUTE_UNUSED_RESULT /* n/a */
     63#  endif
    5764# else
    58 #  define ATTRIBUTE_ALWAYS_INLINE inline
     65#  define ALWAYS_INLINE inline
     66#  define ATTRIBUTE_DEPRECATED /* n/a */
     67#  define ATTRIBUTE_UNUSED_RESULT /* n/a */
    5968# endif
    135144/* ---- Compiler dependent settings ------------------------- */
     145#if (defined __digital__ && defined __unix__)
     146# undef HAVE_MNTENT_H
     148# define HAVE_MNTENT_H 1
     149#endif /* ___digital__ && __unix__ */
     151/* linux/loop.h relies on __u64. Make sure we have that as a proper type
     152 * until userspace is widely fixed.  */
    136153#ifndef __GNUC__
    137154#if defined __INTEL_COMPILER
    141158#endif /* ifndef __GNUC__ */
    143 #if (defined __digital__ && defined __unix__)
    144 # undef HAVE_MNTENT_H
    145 #else
    146 # define HAVE_MNTENT_H 1
    147 #endif /* ___digital__ && __unix__ */
    149160/*----- Kernel versioning ------------------------------------*/
    150161#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
    161 // Don't perpetuate e2fsck crap into the headers.  Clean up e2fsck instead.
     172/* Don't perpetuate e2fsck crap into the headers.  Clean up e2fsck instead. */
    163174#if defined __GLIBC__ || defined __UCLIBC__ \
    170181/* Largest integral types.  */
    171182#if __BIG_ENDIAN__
    172 typedef long int                intmax_t;
    173 typedef unsigned long int       uintmax_t;
     183typedef long                intmax_t;
     184typedef unsigned long       uintmax_t;
    176 typedef long long int           intmax_t;
     187typedef long long           intmax_t;
    178 typedef unsigned long long int  uintmax_t;
    179 #endif
    180 #endif
    182 /* uclibc does not implement daemon for no-mmu systems.
     189typedef unsigned long long  uintmax_t;
     193/* Size-saving "small" ints (arch-dependent) */
     194#if defined(i386) || defined(__x86_64__) || defined(__mips__) || defined(__cris__)
     195/* add other arches which benefit from this... */
     196typedef signed char smallint;
     197typedef unsigned char smalluint;
     199/* for arches where byte accesses generate larger code: */
     200typedef int smallint;
     201typedef unsigned smalluint;
     204/* ISO C Standard:  7.16  Boolean type and values  <stdbool.h> */
     205#if (defined __digital__ && defined __unix__)
     206/* old system without (proper) C99 support */
     207#define bool smalluint
     209/* modern system, so use it */
     210#include <stdbool.h>
     213/* Try to defeat gcc's alignment of "char message[]"-like data */
     214#if 1 /* if needed: !defined(arch1) && !defined(arch2) */
     215#define ALIGN1 __attribute__((aligned(1)))
     216#define ALIGN2 __attribute__((aligned(2)))
     218/* Arches which MUST have 2 or 4 byte alignment for everything are here */
     219#define ALIGN1
     220#define ALIGN2
     224/* uclibc does not implement daemon() for no-mmu systems.
    183225 * For 0.9.29 and svn, __ARCH_USE_MMU__ indicates no-mmu reliably.
    184226 * For earlier versions there is no reliable way to check if we are building
    188230#if defined __UCLIBC__ && __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && \
    189231    __UCLIBC_SUBLEVEL__ > 28 && !defined __ARCH_USE_MMU__
    190 #define BB_NOMMU
     232#define BB_MMU 0
     233#define BB_NOMMU 1
     234#define USE_FOR_NOMMU(...) __VA_ARGS__
     235#define USE_FOR_MMU(...)
     237#define BB_MMU 1
     238/* BB_NOMMU is not defined in this case! */
     239#define USE_FOR_NOMMU(...)
     240#define USE_FOR_MMU(...) __VA_ARGS__
    194244 * libbb.  This would require a platform.c.  It's not going to be cleaned
    195245 * out of the tree, so stop saying it should be. */
     246#if !defined(__dietlibc__)
     247/* Needed for: glibc */
     248/* Not needed for: dietlibc */
     249/* Others: ?? (add as needed) */
    196250#define fdprintf dprintf
     253#if defined(__dietlibc__)
     254static ALWAYS_INLINE char* strchrnul(const char *s, char c)
     256    while (*s && *s != c) ++s;
     257    return (char*)s;
     261/* Don't use lchown with glibc older than 2.1.x ... uClibc lacks it */
     262#if (defined __GLIBC__ && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 1) || \
     263    defined __UC_LIBC__
     264# define lchown chown
    209278#define PRIu32 "u"
    211 /* use legacy setpgrp(pidt_,pid_t) for now.  move to platform.c */
    212 #define bb_setpgrp do{pid_t __me = getpid();setpgrp(__me,__me);}while(0)
     280/* use legacy setpgrp(pid_t,pid_t) for now.  move to platform.c */
     281#define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me,__me); } while (0)
    214283#if !defined ADJ_OFFSET_SINGLESHOT && defined MOD_CLKA && defined MOD_OFFSET
    228 #define bb_setpgrp setpgrp()
     297#define bb_setpgrp() setpgrp()
    231300#if defined(__linux__)
    232301#include <sys/mount.h>
     302/* Make sure we have all the new mount flags we actually try to use. */
     303#ifndef MS_BIND
     304#define MS_BIND        (1<<12)
     306#ifndef MS_MOVE
     307#define MS_MOVE        (1<<13)
     309#ifndef MS_RECURSIVE
     310#define MS_RECURSIVE   (1<<14)
     312#ifndef MS_SILENT
     313#define MS_SILENT      (1<<15)
     316/* The shared subtree stuff, which went in around 2.6.15. */
     317#ifndef MS_UNBINDABLE
     318#define MS_UNBINDABLE  (1<<17)
     320#ifndef MS_PRIVATE
     321#define MS_PRIVATE     (1<<18)
     323#ifndef MS_SLAVE
     324#define MS_SLAVE       (1<<19)
     326#ifndef MS_SHARED
     327#define MS_SHARED      (1<<20)
    233331#if !defined(BLKSSZGET)
    234332#define BLKSSZGET _IO(0x12, 104)
Note: See TracChangeset for help on using the changeset viewer.