Skip to content

Commit

Permalink
clean up all compile warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
mrrbrilliant committed Mar 31, 2021
1 parent a6dc7e7 commit 8e34008
Show file tree
Hide file tree
Showing 18 changed files with 294 additions and 77 deletions.
44 changes: 44 additions & 0 deletions binutils.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
metadata:
name: "binutils"
version: "2.36"
release: 1
description: A linker, an assembler, and other tools for handling object files
architecture:
- x86_64
licenses:
- GPL
project_url:
- https://www.gnu.org/
project_ownder:
- Stallman
sources:
- address: https://ftp.gnu.org/gnu/binutils/binutils-2.36.tar.gz
save_as: binutils-2.36.tar.gz
extract: true
extract_to: ""
security: ~
dependencies: ~
prepare: ~
build: ~
check: ~
package:
commands:
- cd $SRCDIR/$PKGNAME-$PKGVER
- sed -i '/^SUBDIRS/s/doc//' bfd/Makefile.in
- mkdir -v build
- cd $SRCDIR/$PKGNAME-$PKGVER/build
- "$SRCDIR/$PKGNAME-$PKGVER/configure
--prefix=/usr
--enable-gold
--disable-nls
--enable-ld=default
--enable-plugins
--enable-shared
--disable-werror
--with-system-zlib
--disable-multilib
--with-lib-path=/usr/lib:/lib"
- make
- make DESTDIR=$PKGDIR install
deployment: ~
198 changes: 198 additions & 0 deletions linux
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>

pkgbase=linux
pkgver=5.11.11.arch1
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
url="https://git.archlinux.org/linux.git/log/?h=$_srctag"
arch=(x86_64)
license=(GPL2)
makedepends=(
bc kmod libelf pahole cpio perl tar xz
xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick
git
)
options=('!strip')
_srcname=archlinux-linux
source=(
"$_srcname::git+https://git.archlinux.org/linux.git?signed#tag=$_srctag"
config # the main kernel config file
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
'170a5887be33c7caded85156a3bda8ef769d1a38fe33e4973eccc9f0bcc87728')

export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"

prepare() {
cd $_srcname

echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" >localversion.10-pkgrel
echo "${pkgbase#linux}" >localversion.20-pkgname

local src
for src in "${source[@]}"; do
src="${src%%::*}"
src="${src##*/}"
[[ $src = *.patch ]] || continue
echo "Applying patch $src..."
patch -Np1 <"../$src"
done

echo "Setting config..."
cp ../config .config
make olddefconfig

make -s kernelrelease >version
echo "Prepared $pkgbase version $(<version)"
}

build() {
cd $_srcname
make all
make htmldocs
}

_package() {
pkgdesc="The $pkgdesc kernel and modules"
depends=(coreutils kmod initramfs)
optdepends=('crda: to set the correct wireless channels of your country'
'linux-firmware: firmware images needed for some devices')
provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
replaces=(virtualbox-guest-modules-arch wireguard-arch)

cd $_srcname
local kernver="$(<version)"
local modulesdir="$pkgdir/usr/lib/modules/$kernver"

echo "Installing boot image..."
# systemd expects to find the kernel here to allow hibernation
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"

# Used by mkinitcpio to name the kernel
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"

echo "Installing modules..."
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install

# remove build and source links
rm "$modulesdir"/{source,build}
}

_package-headers() {
pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
depends=(pahole)

cd $_srcname
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"

echo "Installing build files..."
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
localversion.* version vmlinux
install -Dt "$builddir/kernel" -m644 kernel/Makefile
install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
cp -t "$builddir" -a scripts

# add objtool for external module building and enabled VALIDATION_STACK option
install -Dt "$builddir/tools/objtool" tools/objtool/objtool

# add xfs and shmem for aufs building
mkdir -p "$builddir"/{fs/xfs,mm}

echo "Installing headers..."
cp -t "$builddir" -a include
cp -t "$builddir/arch/x86" -a arch/x86/include
install -Dt "$builddir/arch/x86/kernel" -m644 arch/x86/kernel/asm-offsets.s

install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h

# http://bugs.archlinux.org/task/13146
install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h

# http://bugs.archlinux.org/task/20402
install -Dt "$builddir/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h

echo "Installing KConfig files..."
find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;

echo "Removing unneeded architectures..."
local arch
for arch in "$builddir"/arch/*/; do
[[ $arch = */x86/ ]] && continue
echo "Removing $(basename "$arch")"
rm -r "$arch"
done

echo "Removing documentation..."
rm -r "$builddir/Documentation"

echo "Removing broken symlinks..."
find -L "$builddir" -type l -printf 'Removing %P\n' -delete

echo "Removing loose objects..."
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete

echo "Stripping build tools..."
local file
while read -rd '' file; do
case "$(file -bi "$file")" in
application/x-sharedlib\;*) # Libraries (.so)
strip -v $STRIP_SHARED "$file" ;;
application/x-archive\;*) # Libraries (.a)
strip -v $STRIP_STATIC "$file" ;;
application/x-executable\;*) # Binaries
strip -v $STRIP_BINARIES "$file" ;;
application/x-pie-executable\;*) # Relocatable binaries
strip -v $STRIP_SHARED "$file" ;;
esac
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)

echo "Stripping vmlinux..."
strip -v $STRIP_STATIC "$builddir/vmlinux"

echo "Adding symlink..."
mkdir -p "$pkgdir/usr/src"
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
}

_package-docs() {
pkgdesc="Documentation for the $pkgdesc kernel"

cd $_srcname
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"

echo "Installing documentation..."
local src dst
while read -rd '' src; do
dst="${src#Documentation/}"
dst="$builddir/Documentation/${dst#output/}"
install -Dm644 "$src" "$dst"
done < <(find Documentation -name '.*' -prune -o ! -type d -print0)

echo "Adding symlink..."
mkdir -p "$pkgdir/usr/share/doc"
ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
}

pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")
for _p in "${pkgname[@]}"; do
eval "package_$_p() {
$(declare -f "_package${_p#$pkgbase}")
_package${_p#$pkgbase}
}"
done

# vim:set ts=8 sts=2 sw=2 et:
3 changes: 1 addition & 2 deletions src/application.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use super::{
statics::{LOCAL_DIR, MANI_FILE},
Dependency, Deployment, Function, Metadata, Security, Source,
Dependency, Metadata, Security,
};
use semver::Version;

use serde::{Deserialize, Serialize};
use std::{
Expand Down
10 changes: 5 additions & 5 deletions src/bin/bin-repo.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use pi::statics::SUFFIX_APP;
use pi::utils::{decompress_zstd, extract_archive};
use pi::utils::decompress_zstd;
use pi::{Application, BinRepo};
use serde_yaml::{from_reader, to_writer};
use std::time::SystemTime;
Expand Down Expand Up @@ -71,7 +71,7 @@ fn create(path: &str) -> Result<(), Error> {
}
}

let mut file = File::create(path)?;
let file = File::create(path)?;
let data = BinRepo::new();
match to_writer(file, &data) {
Ok(_) => Ok(()),
Expand All @@ -87,7 +87,7 @@ fn update_db(path: &str, data: &BinRepo) -> Result<(), Error> {
}
}

let mut file = File::create(path)?;
let file = File::create(path)?;
// let data = BinRepo::default();
match to_writer(file, data) {
Ok(_) => Ok(()),
Expand Down Expand Up @@ -143,7 +143,7 @@ fn add(db_path: &str, pkg_files: Vec<PathBuf>) {
}
let now = SystemTime::now();
db.date = now;
update_db(db_path, &db);
update_db(db_path, &db).unwrap();
}

fn remove(db_path: &str, pkg_files: Vec<PathBuf>) {
Expand All @@ -161,7 +161,7 @@ fn remove(db_path: &str, pkg_files: Vec<PathBuf>) {
}
let now = SystemTime::now();
db.date = now;
update_db(db_path, &db);
update_db(db_path, &db).unwrap();
}

fn help() {
Expand Down
5 changes: 2 additions & 3 deletions src/bin/server.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
use actix_files as fs;
use actix_web::{get, web, App, HttpRequest, HttpResponse, HttpServer, Result};
use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer};
use pi::{
statics::{PUB_DIR, SERVER_CFG_DIR, SERVER_CFG_FILE},
utils::prepare_bases,
BinRepo,
};
use serde::{Deserialize, Serialize};
use serde_yaml::from_reader;
use std::{env, fs::File, path::PathBuf, time::SystemTime};

#[derive(Debug, Clone, Deserialize, Serialize)]
Expand Down Expand Up @@ -57,7 +56,7 @@ fn cfg_data() -> ServerConfig {
cfg
}

async fn with_param(req: HttpRequest, web::Path((name,)): web::Path<(String,)>) -> HttpResponse {
async fn with_param(_req: HttpRequest, web::Path((name,)): web::Path<(String,)>) -> HttpResponse {
let cfg = cfg_data();
let db_dir = PathBuf::from(&cfg.repo_root);
let db_path = db_dir.join(&format!("{}/{}.db", &name, &name));
Expand Down
Loading

0 comments on commit 8e34008

Please sign in to comment.