Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 16 commits
  • 16 files changed
  • 0 commit comments
  • 3 contributors
Commits on Jul 14, 2012
@Florin65 Florin65 dbus: version bumped to 1.6.2.
Keeped the previous patch at Sofar's request.
f196975
@Florin65 Florin65 usbutils: version bumped to 006. fe93437
@Ratler Ratler Kernel names now have vmlinuz as prefix. Also saving versioned config…
…s in /boot.

- All bootloader plugins has been updated to support the new prefix
474d5c7
@Ratler Ratler kernel: Stop kernel from installing conflicting firmware with linux-f…
…irmware

- Added linux-firmware as a dependency to the kernel
d18b0cf
@sofar sofar Merge pull request #15 from Florin65/master
from Florin
c63ec94
@sofar sofar Merge pull request #18 from Ratler/firmware_fix
kernel: Stop kernel from installing conflicting firmware
4ed825f
@sofar sofar Merge pull request #17 from Ratler/vmlinuz
Kernel names now have vmlinuz as prefix. Also saving versioned configs in boot
90f6948
@sofar sofar lunar-tools: update to include installkernel change
installkernel does what the kernel modules internally do
and should do the right thing when manually compiling
and installing kernels.
9fda69c
@sofar sofar Merge branch 'master' of github.com:/lunar-linux/moonbase-core e95f89d
@sofar sofar lunar-tools: don't install removed Changelog. f823f8d
Commits on Jul 15, 2012
@sofar sofar systemd: accidentally added my testing patches. bea949b
@Ratler Ratler systemd: Generate an os-release file that is shell-compatible
- The old file was not shell-compatible, nor did it include any real
  useful information.
1c0b8b2
@sofar sofar Merge pull request #21 from Ratler/systemd_os-release
systemd: Generate an os-release file that is shell-compatible
7bec2d8
Commits on Jul 17, 2012
@Ratler Ratler systemd-sysv: Added proper depends and an alternative pidof be4cc80
@Florin65 Florin65 Linux-PAM: add a patch to compile with glibc-2.16.0. 16fbc08
@sofar sofar Merge pull request #22 from Ratler/systemd-sysv
systemd-sysv: Added proper depends and an alternative pidof
5455ebc
View
8 kernel/linux/BUILD
@@ -1,5 +1,8 @@
(
+ # Do not install firmware on modules_install
+ sedit '/Makefile.*__fw_modinst/d' Makefile
+
# Needed for x86_64
MYARCH="`arch | grep -qw i.86 && echo i386 || arch`"
@@ -15,7 +18,8 @@
backup_mods_krnl $FULL_VERSION
prepare_install
make modules_install
- cp arch/${MYARCH}/boot/bzImage /boot/$FULL_VERSION-`arch`
- cp System.map /boot/System.map-$FULL_VERSION-`arch`
+ cp arch/${MYARCH}/boot/bzImage /boot/vmlinuz-$FULL_VERSION-$(arch)
+ cp System.map /boot/System.map-$FULL_VERSION-$(arch)
+ gzip -c -9 .config > /boot/config-$FULL_VERSION-$(arch).gz
) > $C_FIFO 2>&1
View
1  kernel/linux/DEPENDS
@@ -1,2 +1,3 @@
depends autoconf
depends %KMOD
+depends linux-firmware
View
2  kernel/linux/POST_INSTALL
@@ -1,7 +1,7 @@
PATCH_VERSION=$(echo $VERSION | cut -d . -f 3)
FULL_VERSION=$(echo $VERSION | cut -d . -f 1,2).${PATCH_VERSION:-0}
-update_bootloader $FULL_VERSION-`arch` $VERSION-`arch`
+update_bootloader $FULL_VERSION $VERSION
# Reinstall packages that add their own kernel modules
View
3  security/Linux-PAM/BUILD
@@ -1,5 +1,8 @@
(
+# patch to compile with glibc-2.16.0.
+ patch_it $SOURCE_CACHE/$SOURCE3 1 &&
+
export SGML2LATEX=no
export SGML2TXT=no
export SGML2HTML=no
View
7 security/Linux-PAM/DETAILS
@@ -4,14 +4,17 @@
RHVERSION=0.99.10-1
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE2=$MODULE-patches-$PVERSION.tar.bz2
+ SOURCE3=$MODULE-$VERSION+glibc-2.16.patch.bz2
SOURCE_URL=https://fedorahosted.org/releases/l/i/linux-pam
SOURCE2_URL=$PATCH_URL
+ SOURCE3_URL=$PATCH_URL
SOURCE_VFY=sha256:65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116
SOURCE2_VFY=sha256:6db8ff00621959a683b9b6932267a243263f1dcc1927df5941cb18d6edecf0a9
- WEB_SITE=https://fedorahosted.org/linux-pam/
+ SOURCE3_VFY=sha256:d095179f9b7128cc6502d1b0ac2a947321239ce27f5e7889b78b9de669d17333
+ WEB_SITE=https://fedorahosted.org/linux-pam
MAINTAINER=ratler@lunar-linux.org
ENTERED=20010922
- UPDATED=20120425
+ UPDATED=20120715
SHORT="Pluggable Authentication Modules"
PSAFE=no
View
6 system/dbus/DETAILS
@@ -1,13 +1,13 @@
MODULE=dbus
- VERSION=1.6.0
+ VERSION=1.6.2
SOURCE=$MODULE-$VERSION.tar.gz
SOURCE2=dbus-fix-sba-for-dbus-activation.patch
SOURCE_URL=http://$MODULE.freedesktop.org/releases/$MODULE
SOURCE2_URL=$PATCH_URL
- SOURCE_VFY=sha1:9bfc971ff4cafa2741050d53a98cc7bfdc56880a
+ SOURCE_VFY=sha1:09d55ac4ea4ccf0d233070909494028f5a4e1e63
WEB_SITE=http://dbus.freedesktop.org
ENTERED=20031219
- UPDATED=20120619
+ UPDATED=20120714
SHORT="A message bus system for applications"
LUNAR_RESTART_SERVICES=off
View
7 system/grub/plugin.d/bootloader-grub.plugin
@@ -105,11 +105,12 @@ plugin_kernel_updatebootloader_grub()
add_grub_image()
{
+ local ARCH=$(arch)
if ! has_grub_title "$2" /boot/grub/menu.lst ; then
- print_grub_image "$1" "$2" >> /boot/grub/menu.lst.new
+ print_grub_image "vmlinuz-$1-$ARCH" "$2" >> /boot/grub/menu.lst.new
fi
- if [ -f /boot/"$1.old" ] && ! has_grub_title "$2.old" /boot/grub/menu.lst ; then
- print_grub_image "$1.old" "$2.old" >> /boot/grub/menu.lst.new
+ if [ -f /boot/vmlinuz-$1-$ARCH.old ] && ! has_grub_title "$2.old" /boot/grub/menu.lst ; then
+ print_grub_image "vmlinuz-$1-$ARCH.old" "$2.old" >> /boot/grub/menu.lst.new
fi
}
View
7 system/lilo/plugin.d/bootloader-lilo.plugin
@@ -12,6 +12,7 @@
plugin_kernel_updatebootloader_lilo() {
+ local ARCH=$(arch)
# preferred? - master switch for experienced users
if [ -n "$BOOTLOADER" -a "$BOOTLOADER" != "lilo" ]; then
return 2
@@ -35,9 +36,9 @@ plugin_kernel_updatebootloader_lilo() {
# rename this one to .old
LABEL=" label = $2.old"
SIMAGE=$(echo $IMAGE | tr -d '[:blank:]' | sed 's/image=//')
- if [ "$SIMAGE" == "/boot/$1" ]; then
+ if [ "$SIMAGE" == "/boot/vmlinuz-$1-$ARCH" ]; then
# rename the image too since the module moved it to .old
- IMAGE="image = /boot/$1.old"
+ IMAGE="image = /boot/vmlinuz-$1-$ARCH.old"
fi
elif [ "$SLABEL" == "$2.old" ]; then
# delete this one!
@@ -60,7 +61,7 @@ plugin_kernel_updatebootloader_lilo() {
sed '/other\|image/Q' /etc/lilo.conf
# we didn't have this label yet - insert it rightaway
- echo "image = /boot/$1"
+ echo "image = /boot/vmlinuz-$1-$ARCH"
echo " label = $2"
if [ -z "$READONLY" ]; then
echo " read-only"
View
2  system/syslinux/plugin.d/bootloader-syslinux.plugin
@@ -54,7 +54,7 @@ plugin_kernel_updatebootloader_syslinux() {
if [ -z "$DONE" ]; then
if echo "$LINE" | grep -q "^\s*label" ; then
# insert
- entry "$1" "$2" "$BOOTDIR" "$ROOTPART" >> $TMP
+ entry "vmlinuz-$1-$(arch)" "$2" "$BOOTDIR" "$ROOTPART" >> $TMP
DONE="x"
fi
fi
View
3  system/systemd-sysv/BUILD
@@ -11,6 +11,7 @@
ln -sf /usr/bin/systemctl /sbin/reboot &&
ln -sf /usr/bin/systemctl /sbin/runlevel &&
ln -sf /usr/bin/systemctl /sbin/shutdown &&
- ln -sf /usr/bin/systemctl /sbin/telinit
+ ln -sf /usr/bin/systemctl /sbin/telinit &&
+ ln -sf /bin/pgrep /bin/pidof
) > $C_FIFO
View
2  system/systemd-sysv/DEPENDS
@@ -0,0 +1,2 @@
+depends systemd
+depends procps
View
5 system/systemd/BUILD
@@ -17,11 +17,6 @@
# vconsole.conf defaults to us-layout
[ -f /etc/vconsole.conf ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/vconsole.conf /etc/vconsole.conf &&
- # os-release should properly show lunar
- # todo: we might replace this with some auto-generated
- # values from /etc/lunar.release in the future.
- [ -f /etc/os-release ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/os-release /etc/os-release &&
-
# last but not least the locale settings, defaulting to US
[ -f /etc/locale.conf ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/locale.conf /etc/locale.conf &&
View
20 system/systemd/POST_INSTALL
@@ -46,4 +46,24 @@ if [ -n "$SYSTEMD_ERROR" ]; then
read -n 1
fi
+# Generate some good default files based on current settings
+# /etc/os-release
+if [ ! -f /etc/os-release ] || ! grep -q 'HOME_URL' /etc/os-release ; then
+ if [ -f /etc/lunar.release ]; then
+ DRELEASE=$(awk '{ print $3 }' /etc/lunar.release | cut -d- -f1)
+ DCNAME=$(sed 's;.*(\(.*\) -.*;\1;' /etc/lunar.release)
+ DDESC=$(cat /etc/lunar.release)
+ DVERSION="$DRELEASE ($DCNAME)"
+ fi
+cat <<EOF > /etc/os-release
+NAME="Lunar Linux"
+VERSION="$DVERSION"
+ID=lunar
+VERSION_ID=$DRELEASE
+PRETTY_NAME="$DDESC"
+ANSI_COLOR="1;34"
+HOME_URL="http://lunar-linux.org/"
+EOF
+fi
+
lin -c dbus
View
4 system/systemd/files/os-release
@@ -1,4 +0,0 @@
-NAME=Lunarlinux
-ID=lunar
-PRETTY_NAME=Lunar Linux
-ANSI_COLOR=1;34
View
6 utils/lunar-tools/DETAILS
@@ -1,12 +1,12 @@
MODULE=lunar-tools
- VERSION=2011.1
+ VERSION=2012.2
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE_URL=http://lunar-linux.org/lunar/
- SOURCE_VFY=sha1:e680a92bdfad5d10b42742dff0d52429842d6522
+ SOURCE_VFY=sha1:3e03f5fd6e6bc0d6306b9e71479d7f9833ba8fd2
MAINTAINER=sofar@lunar-linux.org
WEB_SITE=http://lunar-linux.org/
ENTERED=20041029
- UPDATED=20110607
+ UPDATED=20120714
SHORT="A collection of lunar tools"
cat << EOF
Lunar-tools is a package with non-vital tools that help you perform
View
6 utils/usbutils/DETAILS
@@ -1,15 +1,15 @@
MODULE=usbutils
- VERSION=004
+ VERSION=006
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE2=usb.ids.gz
SOURCE_URL[0]=http://ftp.uni-frankfurt.de/kernel/linux/utils/usb/$MODULE
SOURCE_URL[1]=http://mirror.anl.gov/pub/linux/utils/usb/$MODULE
# SOURCE_URL[1]=$SFORGE_URL/linux-usb
SOURCE2_URL=http://www.linux-usb.org
- SOURCE_VFY=sha1:3fb1d5dfa30b3926ba976f3497eb0fb609094b5d
+ SOURCE_VFY=sha1:0a6457f5deb8619be9b4b96b3848f2f61ce10d11
WEB_SITE=http://kerneltrap.org/node/4649
ENTERED=20030108
- UPDATED=20110817
+ UPDATED=20110714
SHORT="The pciutils of usb"
cat << EOF

No commit comments for this range

Something went wrong with that request. Please try again.