commit 7f493d2ae64f788c326142f5f2282859d147d8d1 · pyrox.dev/nixpkgs

pkgs/os-specific/bsd/openbsd/pkgs/stand.nix pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix

···

       8
       8
        
         path = "sys/arch/amd64/stand";

     

       9
       9
        
         extraPaths = [ "sys" ];

     

       10
       10
        
       

     

       11
       11
       +
         patches = [ ../sys/initpath.patch ];

     

       12
       12
       +
       

     

       11
       13
        
         # gcc compat

     

       12
       14
        
         postPatch = ''

     

       13
       15
        
           find $BSDSRCDIR -name Makefile -print0 | xargs -0 sed -E -i -e 's/-nopie/-no-pie/g'

-66

pkgs/os-specific/bsd/openbsd/pkgs/sys.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         mkDerivation,

     

       3
       3
       -
         boot-config,

     

       4
       4
       -
         pkgsBuildTarget,

     

       5
       5
       -
         baseConfig ? "GENERIC",

     

       6
       6
       -
       }:

     

       7
       7
       -
       mkDerivation {

     

       8
       8
       -
         path = "sys/arch/amd64";

     

       9
       9
       -
         pname = "sys";

     

       10
       10
       -
         extraPaths = [ "sys" ];

     

       11
       11
       -
         noLibc = true;

     

       12
       12
       -
       

     

       13
       13
       -
         extraNativeBuildInputs = [

     

       14
       14
       -
           boot-config

     

       15
       15
       -
         ];

     

       16
       16
       -
       

     

       17
       17
       -
         postPatch =

     

       18
       18
       -
           # The in-kernel debugger (DDB) requires compiler flags not supported by clang, disable it

     

       19
       19
       -
           ''

     

       20
       20
       -
             sed -E -i -e '/DDB/d' $BSDSRCDIR/sys/conf/GENERIC

     

       21
       21
       -
             sed -E -i -e '/pseudo-device\tdt/d' $BSDSRCDIR/sys/arch/amd64/conf/GENERIC

     

       22
       22
       -
           ''

     

       23
       23
       -
           +

     

       24
       24
       -
             # Clang flags compatibility

     

       25
       25
       -
             ''

     

       26
       26
       -
               find $BSDSRCDIR -name 'Makefile*' -exec sed -E -i -e 's/-fno-ret-protector/-fno-stack-protector/g' -e 's/-nopie/-no-pie/g' {} +

     

       27
       27
       -
               sed -E -i -e 's_^\tinstall.*$_\tinstall bsd ''${out}/bsd_' -e s/update-link// $BSDSRCDIR/sys/arch/*/conf/Makefile.*

     

       28
       28
       -
             ''

     

       29
       29
       -
           +

     

       30
       30
       -
             # Remove randomness in build

     

       31
       31
       -
             ''

     

       32
       32
       -
               sed -E -i -e 's/^PAGE_SIZE=.*$/PAGE_SIZE=4096/g' -e '/^random_uniform/a echo 0; return 0;' $BSDSRCDIR/sys/conf/makegap.sh

     

       33
       33
       -
               sed -E -i -e 's/^v=.*$/v=0 u=nixpkgs h=nixpkgs t=`date -d @1`/g' $BSDSRCDIR/sys/conf/newvers.sh

     

       34
       34
       -
             '';

     

       35
       35
       -
       

     

       36
       36
       -
         postConfigure = ''

     

       37
       37
       -
           export BSDOBJDIR=$TMP/obj

     

       38
       38
       -
           mkdir $BSDOBJDIR

     

       39
       39
       -
           make obj

     

       40
       40
       -
       

     

       41
       41
       -
           cd conf

     

       42
       42
       -
           config ${baseConfig}

     

       43
       43
       -
           cd -

     

       44
       44
       -
         '';

     

       45
       45
       -
       

     

       46
       46
       -
         preBuild =

     

       47
       47
       -
           # A lot of files insist on calling unprefixed GNU `ld` and `objdump`.

     

       48
       48
       -
           # It's easier to add them to PATH than patch and substitute.

     

       49
       49
       -
           ''

     

       50
       50
       -
             mkdir $TMP/bin

     

       51
       51
       -
             export PATH=$TMP/bin:$PATH

     

       52
       52
       -
             ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objdump $TMP/bin/objdump

     

       53
       53
       -
             ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}ld $TMP/bin/ld

     

       54
       54
       -
           ''

     

       55
       55
       -
           +

     

       56
       56
       -
             # The Makefile claims it needs includes, but it really doesn't.

     

       57
       57
       -
             # Tell it includes aren't real and can't hurt it.

     

       58
       58
       -
             ''

     

       59
       59
       -
               cd compile/${baseConfig}/obj

     

       60
       60
       -
               echo 'includes:' >>Makefile

     

       61
       61
       -
             '';

     

       62
       62
       -
       

     

       63
       63
       -
         # stand is in a separate package

     

       64
       64
       -
         env.SKIPDIR = "stand";

     

       65
       65
       -
         env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument -Wno-visibility";

     

       66
       66
       -
       }

+166

pkgs/os-specific/bsd/openbsd/pkgs/sys/initpath.patch

···

       1
       1
       +
       OpenBSD hardcodes the /sbin/init path which is super unhelpful for booting a

     

       2
       2
       +
       NixOS system. This patch adds a boot parameter that can be passed through the

     

       3
       3
       +
       bootloader and into the kernel specifying which init binary to use. This patch

     

       4
       4
       +
       will assuredly not be accepted upstream but is very relevant to nixpkgs.

     

       5
       5
       +
       

     

       6
       6
       +
       This patch applies for both sys and stand.

     

       7
       7
       +
       

     

       8
       8
       +
       diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c

     

       9
       9
       +
       index f58e6c585c1..874f5a74d6d 100644

     

       10
       10
       +
       --- a/sys/arch/amd64/amd64/machdep.c

     

       11
       11
       +
       +++ b/sys/arch/amd64/amd64/machdep.c

     

       12
       12
       +
       @@ -181,6 +181,7 @@ int	physmem;

     

       13
       13
       +
        u_int64_t	dumpmem_low;

     

       14
       14
       +
        u_int64_t	dumpmem_high;

     

       15
       15
       +
        extern int	boothowto;

     

       16
       16
       +
       +extern char	initpath[MAXPATHLEN];

     

       17
       17
       +
        int	cpu_class;

     

       18
       18
       +
        

     

       19
       19
       +
        paddr_t	dumpmem_paddr;

     

       20
       20
       +
       @@ -255,6 +256,7 @@ bios_memmap_t	*bios_memmap;

     

       21
       21
       +
        u_int32_t	bios_cksumlen;

     

       22
       22
       +
        bios_efiinfo_t	*bios_efiinfo;

     

       23
       23
       +
        bios_ucode_t	*bios_ucode;

     

       24
       24
       +
       +char		*passed_init;

     

       25
       25
       +
        

     

       26
       26
       +
        #if NEFI > 0

     

       27
       27
       +
        EFI_MEMORY_DESCRIPTOR *mmap;

     

       28
       28
       +
       @@ -1992,6 +1994,7 @@ getbootinfo(char *bootinfo, int bootinfo_size)

     

       29
       29
       +
        	bios_ddb_t *bios_ddb;

     

       30
       30
       +
        	bios_bootduid_t *bios_bootduid;

     

       31
       31
       +
        	bios_bootsr_t *bios_bootsr;

     

       32
       32
       +
       +	char *init_param;

     

       33
       33
       +
        #undef BOOTINFO_DEBUG

     

       34
       34
       +
        #ifdef BOOTINFO_DEBUG

     

       35
       35
       +
        	printf("bootargv:");

     

       36
       36
       +
       @@ -2089,6 +2092,11 @@ getbootinfo(char *bootinfo, int bootinfo_size)

     

       37
       37
       +
        			bios_ucode = (bios_ucode_t *)q->ba_arg;

     

       38
       38
       +
        			break;

     

       39
       39
       +
        

     

       40
       40
       +
       +		case BOOTARG_INIT:

     

       41
       41
       +
       +			init_param = (char*)q->ba_arg;

     

       42
       42
       +
       +			memcpy(initpath, init_param, sizeof(initpath));

     

       43
       43
       +
       +			break;

     

       44
       44
       +
       +

     

       45
       45
       +
        		default:

     

       46
       46
       +
        #ifdef BOOTINFO_DEBUG

     

       47
       47
       +
        			printf(" unsupported arg (%d) %p", q->ba_type,

     

       48
       48
       +
       diff --git a/sys/arch/amd64/include/biosvar.h b/sys/arch/amd64/include/biosvar.h

     

       49
       49
       +
       index b0c71ea0350..93e81b1b051 100644

     

       50
       50
       +
       --- a/sys/arch/amd64/include/biosvar.h

     

       51
       51
       +
       +++ b/sys/arch/amd64/include/biosvar.h

     

       52
       52
       +
       @@ -225,6 +225,8 @@ typedef struct _bios_ucode {

     

       53
       53
       +
        	uint64_t	uc_size;

     

       54
       54
       +
        } __packed bios_ucode_t;

     

       55
       55
       +
        

     

       56
       56
       +
       +#define BOOTARG_INIT 13

     

       57
       57
       +
       +

     

       58
       58
       +
        #if defined(_KERNEL) || defined (_STANDALONE)

     

       59
       59
       +
        

     

       60
       60
       +
        #ifdef _LOCORE

     

       61
       61
       +
       diff --git a/sys/arch/amd64/stand/efiboot/efiboot.c b/sys/arch/amd64/stand/efiboot/efiboot.c

     

       62
       62
       +
       index 95cf92d298d..ee77f6769fd 100644

     

       63
       63
       +
       --- a/sys/arch/amd64/stand/efiboot/efiboot.c

     

       64
       64
       +
       +++ b/sys/arch/amd64/stand/efiboot/efiboot.c

     

       65
       65
       +
       @@ -965,6 +965,9 @@ efi_makebootargs(void)

     

       66
       66
       +
        #endif

     

       67
       67
       +
        

     

       68
       68
       +
        	addbootarg(BOOTARG_EFIINFO, sizeof(bios_efiinfo), &bios_efiinfo);

     

       69
       69
       +
       +	if (cmd.init[0] != 0) {

     

       70
       70
       +
       +		addbootarg(BOOTARG_INIT, sizeof(cmd.init), &cmd.init);

     

       71
       71
       +
       +	}

     

       72
       72
       +
        }

     

       73
       73
       +
        

     

       74
       74
       +
        /* Vendor device path used to indicate the mmio UART on AMD SoCs. */

     

       75
       75
       +
       diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c

     

       76
       76
       +
       index b4816b2e9a0..db412097035 100644

     

       77
       77
       +
       --- a/sys/kern/init_main.c

     

       78
       78
       +
       +++ b/sys/kern/init_main.c

     

       79
       79
       +
       @@ -103,6 +103,8 @@ extern void stoeplitz_init(void);

     

       80
       80
       +
        #include "vscsi.h"

     

       81
       81
       +
        #include "softraid.h"

     

       82
       82
       +
        

     

       83
       83
       +
       +#define DEBUG 1

     

       84
       84
       +
       +

     

       85
       85
       +
        const char	copyright[] =

     

       86
       86
       +
        "Copyright (c) 1982, 1986, 1989, 1991, 1993\n"

     

       87
       87
       +
        "\tThe Regents of the University of California.  All rights reserved.\n"

     

       88
       88
       +
       @@ -127,6 +129,7 @@ int	db_active = 0;

     

       89
       89
       +
        int	ncpus =  1;

     

       90
       90
       +
        int	ncpusfound = 1;			/* number of cpus we find */

     

       91
       91
       +
        volatile int start_init_exec;		/* semaphore for start_init() */

     

       92
       92
       +
       +char	initpath[MAXPATHLEN];

     

       93
       93
       +
        

     

       94
       94
       +
        #if !defined(NO_PROPOLICE)

     

       95
       95
       +
        long	__guard_local __attribute__((section(".openbsd.randomdata")));

     

       96
       96
       +
       @@ -557,6 +560,7 @@ static char *initpaths[] = {

     

       97
       97
       +
        	"/sbin/init",

     

       98
       98
       +
        	"/sbin/oinit",

     

       99
       99
       +
        	"/sbin/init.bak",

     

       100
       100
       +
       +	initpath,

     

       101
       101
       +
        	NULL,

     

       102
       102
       +
        };

     

       103
       103
       +
        

     

       104
       104
       +
       diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c

     

       105
       105
       +
       index e090a0d0180..1a20b1ece47 100644

     

       106
       106
       +
       --- a/sys/stand/boot/boot.c

     

       107
       107
       +
       +++ b/sys/stand/boot/boot.c

     

       108
       108
       +
       @@ -74,7 +74,7 @@ boot(dev_t bootdev)

     

       109
       109
       +
        	devboot(bootdev, cmd.bootdev);

     

       110
       110
       +
        	strlcpy(cmd.image, kernelfile, sizeof(cmd.image));

     

       111
       111
       +
        	cmd.boothowto = 0;

     

       112
       112
       +
       -	cmd.conf = "/etc/boot.conf";

     

       113
       113
       +
       +	cmd.conf = "/boot/nixos/default.conf";

     

       114
       114
       +
        	cmd.timeout = boottimeout;

     

       115
       115
       +
        

     

       116
       116
       +
        	if (upgrade()) {

     

       117
       117
       +
       diff --git a/sys/stand/boot/cmd.h b/sys/stand/boot/cmd.h

     

       118
       118
       +
       index 5045f052b8b..327f3de8d84 100644

     

       119
       119
       +
       --- a/sys/stand/boot/cmd.h

     

       120
       120
       +
       +++ b/sys/stand/boot/cmd.h

     

       121
       121
       +
       @@ -43,6 +43,7 @@ struct cmd_table {

     

       122
       122
       +
        struct cmd_state {

     

       123
       123
       +
        	char bootdev[BOOTDEVLEN]; /* device */

     

       124
       124
       +
        	char image[MAXPATHLEN - 16]; /* image */

     

       125
       125
       +
       +	char init[MAXPATHLEN];

     

       126
       126
       +
        	int  boothowto; /* howto */

     

       127
       127
       +
        	char *conf; /* /etc/boot.conf normally */

     

       128
       128
       +
        	int timeout;

     

       129
       129
       +
       diff --git a/sys/stand/boot/vars.c b/sys/stand/boot/vars.c

     

       130
       130
       +
       index d1516776315..b12edcdaeac 100644

     

       131
       131
       +
       --- a/sys/stand/boot/vars.c

     

       132
       132
       +
       +++ b/sys/stand/boot/vars.c

     

       133
       133
       +
       @@ -42,6 +42,7 @@ static int Xdevice(void);

     

       134
       134
       +
        static int Xdebug(void);

     

       135
       135
       +
        #endif

     

       136
       136
       +
        static int Xdb_console(void);

     

       137
       137
       +
       +static int Xinit(void);

     

       138
       138
       +
        static int Ximage(void);

     

       139
       139
       +
        static int Xhowto(void);

     

       140
       140
       +
        #ifdef BOOT_STTY

     

       141
       141
       +
       @@ -63,6 +64,7 @@ const struct cmd_table cmd_set[] = {

     

       142
       142
       +
        	{"image",  CMDT_VAR, Ximage},

     

       143
       143
       +
        	{"timeout",CMDT_VAR, Xtimeout},

     

       144
       144
       +
        	{"db_console", CMDT_VAR, Xdb_console},

     

       145
       145
       +
       +	{"init", CMDT_VAR, Xinit},

     

       146
       146
       +
        	{NULL,0}

     

       147
       147
       +
        };

     

       148
       148
       +
        

     

       149
       149
       +
       @@ -107,6 +109,17 @@ Xdb_console(void)

     

       150
       150
       +
        	return (0);

     

       151
       151
       +
        }

     

       152
       152
       +
        

     

       153
       153
       +
       +int

     

       154
       154
       +
       +Xinit(void)

     

       155
       155
       +
       +{

     

       156
       156
       +
       +	if (cmd.argc != 2) {

     

       157
       157
       +
       +		printf("%s\n", cmd.init);

     

       158
       158
       +
       +	} else {

     

       159
       159
       +
       +		strlcpy(cmd.init, cmd.argv[1], sizeof(cmd.init));

     

       160
       160
       +
       +	}

     

       161
       161
       +
       +	return 0;

     

       162
       162
       +
       +}

     

       163
       163
       +
       +

     

       164
       164
       +
        static int

     

       165
       165
       +
        Xtimeout(void)

     

       166
       166
       +
        {

+74

pkgs/os-specific/bsd/openbsd/pkgs/sys/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         buildPackages,

     

       3
       3
       +
         stdenvNoLibc,

     

       4
       4
       +
         overrideCC,

     

       5
       5
       +
         mkDerivation,

     

       6
       6
       +
         boot-config,

     

       7
       7
       +
         pkgsBuildTarget,

     

       8
       8
       +
         baseConfig ? "GENERIC",

     

       9
       9
       +
       }:

     

       10
       10
       +
       (mkDerivation.override {

     

       11
       11
       +
         stdenvNoLibc = overrideCC stdenvNoLibc buildPackages.llvmPackages_18.clangNoLibc;

     

       12
       12
       +
       })

     

       13
       13
       +
         {

     

       14
       14
       +
           path = "sys/arch/amd64";

     

       15
       15
       +
           pname = "sys";

     

       16
       16
       +
           extraPaths = [ "sys" ];

     

       17
       17
       +
           noLibc = true;

     

       18
       18
       +
       

     

       19
       19
       +
           patches = [ ./initpath.patch ];

     

       20
       20
       +
       

     

       21
       21
       +
           extraNativeBuildInputs = [

     

       22
       22
       +
             boot-config

     

       23
       23
       +
           ];

     

       24
       24
       +
       

     

       25
       25
       +
           postPatch =

     

       26
       26
       +
             # The in-kernel debugger (DDB) requires compiler flags not supported by clang, disable it

     

       27
       27
       +
             ''

     

       28
       28
       +
               sed -E -i -e '/DDB/d' $BSDSRCDIR/sys/conf/GENERIC

     

       29
       29
       +
               sed -E -i -e '/pseudo-device\tdt/d' $BSDSRCDIR/sys/arch/amd64/conf/GENERIC

     

       30
       30
       +
             ''

     

       31
       31
       +
             +

     

       32
       32
       +
               # Clang flags compatibility

     

       33
       33
       +
               ''

     

       34
       34
       +
                 find $BSDSRCDIR -name 'Makefile*' -exec sed -E -i -e 's/-fno-ret-protector/-fno-stack-protector/g' -e 's/-nopie/-no-pie/g' {} +

     

       35
       35
       +
                 sed -E -i -e 's_^\tinstall.*$_\tinstall bsd ''${out}/bsd_' -e s/update-link// $BSDSRCDIR/sys/arch/*/conf/Makefile.*

     

       36
       36
       +
               ''

     

       37
       37
       +
             +

     

       38
       38
       +
               # Remove randomness in build

     

       39
       39
       +
               ''

     

       40
       40
       +
                 sed -E -i -e 's/^PAGE_SIZE=.*$/PAGE_SIZE=4096/g' -e '/^random_uniform/a echo 0; return 0;' $BSDSRCDIR/sys/conf/makegap.sh

     

       41
       41
       +
                 sed -E -i -e 's/^v=.*$/v=0 u=nixpkgs h=nixpkgs t=`date -d @1`/g' $BSDSRCDIR/sys/conf/newvers.sh

     

       42
       42
       +
               '';

     

       43
       43
       +
       

     

       44
       44
       +
           postConfigure = ''

     

       45
       45
       +
             export BSDOBJDIR=$TMP/obj

     

       46
       46
       +
             mkdir $BSDOBJDIR

     

       47
       47
       +
             make obj

     

       48
       48
       +
       

     

       49
       49
       +
             cd conf

     

       50
       50
       +
             config ${baseConfig}

     

       51
       51
       +
             cd -

     

       52
       52
       +
           '';

     

       53
       53
       +
       

     

       54
       54
       +
           preBuild =

     

       55
       55
       +
             # A lot of files insist on calling unprefixed GNU `ld` and `objdump`.

     

       56
       56
       +
             # It's easier to add them to PATH than patch and substitute.

     

       57
       57
       +
             ''

     

       58
       58
       +
               mkdir $TMP/bin

     

       59
       59
       +
               export PATH=$TMP/bin:$PATH

     

       60
       60
       +
               ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}objdump $TMP/bin/objdump

     

       61
       61
       +
               ln -s ${pkgsBuildTarget.binutils}/bin/${pkgsBuildTarget.binutils.targetPrefix}ld $TMP/bin/ld

     

       62
       62
       +
             ''

     

       63
       63
       +
             +

     

       64
       64
       +
               # The Makefile claims it needs includes, but it really doesn't.

     

       65
       65
       +
               # Tell it includes aren't real and can't hurt it.

     

       66
       66
       +
               ''

     

       67
       67
       +
                 cd compile/${baseConfig}/obj

     

       68
       68
       +
                 echo 'includes:' >>Makefile

     

       69
       69
       +
               '';

     

       70
       70
       +
       

     

       71
       71
       +
           # stand is in a separate package

     

       72
       72
       +
           env.SKIPDIR = "stand";

     

       73
       73
       +
           env.NIX_CFLAGS_COMPILE = "-Wno-unused-command-line-argument -Wno-visibility";

     

       74
       74
       +
         }